Changeset 16835

Timestamp:

2008-08-15T17:05:08+12:00 (16 years ago)

Author:

mdewsnip

Message:

Now gets the list of OAI nodes to output from the GDBM file ("oai" node). Previously it just used the numdocs value from the build.cfg file, and assumed that the oai nodes were "oai.0" -> "oai.X". This isn't any good if you want to include section-level nodes in the OAI output.

File:

• gsdl/trunk/runtime-src/src/oaiservr/abstractlistaction.cpp (modified) (2 diffs)

gsdl/trunk/runtime-src/src/oaiservr/abstractlistaction.cpp

@@ -73 +73 @@
 { int startDoc = 0;
 
-  // get the collection information
-  protocol->get_collectinfo(gsdlCollect, cinfo, err, *this->logout);
-
   text_t metadataPrefix = params["metadataPrefix"];
 
@@ -86 +83 @@
     }
   }
+
+  // Get the OAI nodes from the info db file
+  text_t oai_root_node = "oai";
+  text_tset metadata;  // Must be empty for efficiency
+  FilterResponse_t response;
+  get_children(oai_root_node, gsdlCollect, "", metadata, false, protocol, response, *this->logout);
   
   // If numDocs is 0, do nothing - this->prevDocSeen will stay false if this is the only collection
   // looked at, or will keep whatever value it had prior to this col (ensures that if the flag has
   // been set to true by a previous collection that this won't overwrite it to be false). 
-  if (cinfo.numDocs > 0) {
+  if (response.docInfo.size() > 0) {
     int errorCount      = 0; // Count the number of errors found in the given collection
 
-    for (long i = startDoc; i < cinfo.numDocs; ++i) {
+    for (long i = startDoc; i < response.docInfo.size(); ++i) {
       if (errorCount > 3) { // If num errors reaches the cut-off value, bail.
     cerr << "Error: too many records(" << errorCount << ") in the " << gsdlCollect