Changeset 11311 for trunk

Timestamp:

2006-03-08T14:27:44+13:00 (18 years ago)

Author:

kjdon

Message:

anywhere where we determine document/classifier by checking for starting with HASH, I changed to check if starts with CL

Location:

trunk/gsdl/src/oaiservr

Files:

• abstractlistaction.cpp (modified) (3 diffs)
• listsetsaction.cpp (modified) (3 diffs)
• metaformat.cpp (modified) (1 diff)
• recordaction.cpp (modified) (2 diffs)

trunk/gsdl/src/oaiservr/abstractlistaction.cpp

@@ -197 +197 @@
       }
       
-      // Check that the item with the HASH ID 'gsdl_id' has a lastmodified field that fits within
+      // Check that the item with the 0ID 'gsdl_id' has a lastmodified field that fits within
       // the required date range (if specified).
       if (this->inDateRange(params["from"], params["until"], gsdlCollect, gsdl_id, protocol, output)) {
@@ -354 +354 @@
     text_t child = response.docInfo[c].OID;
     
-    // check for HASH items and exclude them
+    // distinguish classifiers and documents by checking whether OID 
+    // starts with CL or not
     text_t childHead;
     text_t::const_iterator start = child.begin();
     text_t::const_iterator here  = child.begin();
-    here += 4;
+    here += 2;
     childHead = substr(start, here);
     
     // documents we output now
-    if (childHead == "HASH") {
-      // Check that the item with the HASH ID 'gsdl_id' has a lastmodified field that fits
+    if (childHead != "CL") {
+      // Check that the item with the 0ID 'gsdl_id' has a lastmodified field that fits
       // within the required date range (if specified)
       if (this->inDateRange(from, until, collection, child, protocol, output)) {
@@ -386 +387 @@
 }
 
-/*
-bool listrecsaction::recurse_set(ostream &output, recptproto *protocol, const text_t &collection, const text_t &classifier, const text_t &metadataPrefix)
-{
-  FilterResponse_t response;
-  text_tset        metadata;
-  ofstream         logout("oai.log", ios::app);
-  bool             prevDocSeen = false;
-
-  get_children(classifier, collection, metadata, false, protocol, response, logout);
-
-  for (int c = 0; c < response.numDocs; ++c) {
-    text_t child = response.docInfo[c].OID;
-    
-    // check for HASH items and exclude them
-    text_t childHead;
-    text_t::const_iterator start = child.begin();
-    text_t::const_iterator here  = child.begin();
-    here += 4;
-    childHead = substr(start, here);
-    
-    // documents we output now
-    if (childHead == "HASH") {
-      this->output_document(output, protocol, collection, child, metadataPrefix);
-      ++this->outputDocs;
-      prevDocSeen = true;
-    }
-    // children which are classifiers are recursed
-    else {
-      prevDocSeen = this->recurse_set(output, protocol, collection, child, metadataPrefix);
-    }
-  }
-  return prevDocSeen;
-}
-*/
-
-
-
-
+
+
+

trunk/gsdl/src/oaiservr/listsetsaction.cpp

@@ -61 +61 @@
     // get all the children of the (relevant) classifier data structures
     get_children(browseOID, gsdlCollect, "", metadata, false, protocol, response, logout);
-  
     // and send them to the "recurse_content" list
     for (int c = 0; c < response.numDocs; ++c) {
@@ -85 +84 @@
   // get the document information
   if (!get_info(classifier, collection, "", metadata, false, protocol, response, logout)) {
-    // cerr << "Bad identifier or protocol " << classifier << endl;
+    //cerr << "recurse content: Bad identifier or protocol " << classifier << endl;
     return;
   }
@@ -146 +145 @@
       continue;
 
-    // check for HASH items and exclude them
+    // check for non classifier items and exclude them
     text_t childHead;
     text_t::const_iterator start = child.begin();
     text_t::const_iterator here  = child.begin();
-    here += 4;
+    here += 2;
     childHead = substr(start, here);
 
-    if (childHead == "HASH")
+    if (childHead != "CL")
       continue;
 

trunk/gsdl/src/oaiservr/metaformat.cpp

@@ -139 +139 @@
   text_t::const_iterator start = OID.begin();
   text_t::const_iterator here  = OID.begin();
-  here += 4;
+  here += 2;
   childHead = substr(start, here);
 
   // if it isn't a document, kill it now
-  if (childHead != "HASH") {
+  if (childHead == "CL") {
     //    cerr << "Not a document" << endl;
     return false;

trunk/gsdl/src/oaiservr/recordaction.cpp

@@ -92 +92 @@
   // get the document information
   if (!get_info(OID, collection, "", metadata, false, protocol, this->gsdlResponse, logout)) {
+
     this->errorType = "idDoesNotExist";
 
@@ -111 +112 @@
   text_t::const_iterator start = OID.begin();
   text_t::const_iterator here  = OID.begin();
-  here += 4;
+  here += 2;
   childHead = substr(start, here);
   
   // if it isn't a document, kill it now
-  if (childHead != "HASH") {
+  if (childHead == "CL") {
     cerr << "Not a document" << endl;
     return false;