Changeset 1342 for branches/z3950-branch/gsdl/src/recpt/OIDtools.cpp

Timestamp:

2000-08-03T14:49:41+12:00 (24 years ago)

Author:

johnmcp

Message:

Relatively stable z39.50 implementation now, merged with the mgpp source.
(Still needs a decent interface and query language though...)

File:

• branches/z3950-branch/gsdl/src/recpt/OIDtools.cpp (modified) (3 diffs)

branches/z3950-branch/gsdl/src/recpt/OIDtools.cpp

@@ -22 +22 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id$
- *
  *********************************************************************/
-
-/*
-   $Log$
-   Revision 1.18  1999/10/24 07:24:34  sjboddie
-   small change to allow FullTOC option
-
-   Revision 1.17  1999/10/10 08:14:02  sjboddie
-   - metadata now returns mp rather than array
-   - redesigned browsing support (although it's not finished so
-   won't currently work ;-)
-
-   Revision 1.16  1999/09/07 04:56:51  sjboddie
-   added GPL notice
-
-   Revision 1.15  1999/09/02 00:22:04  rjmcnab
-   added extra check in get_info
-
-   Revision 1.14  1999/08/25 04:45:25  sjboddie
-   changed FilterRequest_t::docSet into an array
-
-   Revision 1.13  1999/08/10 22:44:06  sjboddie
-   altered the get_contents function so it's now passed metadata
-   rather than having it hard-coded
-
-   Revision 1.12  1999/07/30 02:26:44  sjboddie
-   added overloaded get_info function for getting info on multiple OIDs
-
-   Revision 1.11  1999/07/20 02:59:03  sjboddie
-   get_children now takes a getParents argument
-
-   Revision 1.10  1999/07/07 05:47:41  sjboddie
-   changed around the way browsetools works
-
-   Revision 1.9  1999/06/16 23:51:53  sjboddie
-   added a strip_suffix function
-
-   Revision 1.8  1999/06/16 03:11:25  sjboddie
-   get_info() now takes a getParents argument
-
-   Revision 1.7  1999/06/16 02:05:23  sjboddie
-   just changed a comment that was confusing me
-
-   Revision 1.6  1999/05/10 03:40:25  sjboddie
-   lots of changes - slowly getting document action sorted out
-
-   Revision 1.5  1999/04/30 01:59:37  sjboddie
-   lots of stuff - getting documentaction working (documentaction replaces
-   old browseaction)
-
-   Revision 1.4  1999/03/29 02:14:25  sjboddie
-
-   More changes to browseaction
-
-   Revision 1.3  1999/03/25 03:13:42  sjboddie
-
-   More library functions for dealing with OIDs. Many of them just
-   return dummy data at present
-
-   Revision 1.2  1999/03/05 03:53:53  sjboddie
-
-   fixed some bugs
-
-   Revision 1.1  1999/03/04 22:38:20  sjboddie
-
-   Added subjectbrowseaction. - Doesn't do anything yet.
-
- */
 
 #include "OIDtools.h"
@@ -173 +104 @@
 }
 
+// overloaded, to allow "custom" filter options.
+bool get_info (const text_t &OID, const text_t &collection,
+           const text_tset &metadata, const OptionValue_tarray &options,
+           bool getParents,
+           recptproto *collectproto, FilterResponse_t &response, 
+           ostream &logout) {
+
+  response.clear();
+
+  comerror_t err;
+  FilterRequest_t request;
+
+  request.filterName = "NullFilter";
+  request.filterResultOptions = FRmetadata;
+  request.getParents = getParents;
+  request.filterOptions = options;
+  request.fields = metadata;
+  request.docSet.push_back (OID);
+  
+  collectproto->filter (collection, request, response, err, logout);
+  if (err != noError) {
+    outconvertclass text_t2ascii;
+    logout << text_t2ascii
+       << "Error: call to filter failed for " << OID
+       << " in OIDtools::get_info (" 
+       << get_comerror_string (err) << ")\n";
+    return false;
+  }
+  
+  return true;
+}
+
 bool get_info (const text_tarray &OIDs, const text_t &collection,
            const text_tset &metadata, bool getParents,
@@ -202 +165 @@
   return true;
 }
+
+
 
 // has_children returns true if OID has children