Changeset 8219

Timestamp:

2004-10-06T05:34:24+13:00 (20 years ago)

Author:

cs025

Message:

Fixes and extensions to remedy small changes with OAI and tidying of code...

Location:

trunk/gsdl/src/oaiservr

Files:

• Makefile.in (modified) (1 diff)
• abstractlistaction.cpp (modified) (2 diffs)
• dublincore.cpp (modified) (2 diffs)
• metaformat.cpp (modified) (2 diffs)
• oaiconfig.cpp (modified) (1 diff)
• oaitools.cpp (modified) (1 diff)
• resumptiontoken.cpp (modified) (1 diff)
• rfc1807.cpp (modified) (1 diff)

trunk/gsdl/src/oaiservr/Makefile.in

@@ -194 +194 @@
 
 install:
-    install -m 755 -s library ../../cgi-bin
+    install -m 755 -s oaimain ../../cgi-bin
 
 depend:

trunk/gsdl/src/oaiservr/abstractlistaction.cpp

@@ -4 +4 @@
 #include "oaitools.h"
 
-#define MAXRECORDS 10
+// The following makes sure that we don't actually use ResumptionTokens
+#define MAXRECORDS -1
 
 bool abstractlistaction::validateAction(recptproto *protocol, oaiargs &params, int &numArgs)
@@ -144 +145 @@
   }
 
-  // do a resumption token if required
-  if (this->replyToken != NULL) {
+  // do a resumption token if required; errors cancel a token...
+  if (this->replyToken != NULL && this->errorType != "") {
     output << "<resumptionToken>";
     output << this->replyToken->getToken();

trunk/gsdl/src/oaiservr/dublincore.cpp

@@ +1 @@
+
 #include "dublincore.h"
 
@@ -6 +7 @@
 
 const text_t dublin_core::formatPrefix() {
-  return "dc.";
+  return "dc";
 }
 

trunk/gsdl/src/oaiservr/metaformat.cpp

@@ -27 +27 @@
 
   for (int item = 0; item < values.size(); item ++) {
-    if ((this->formatPrefix() == "dc.") && (this->oaiConfigure->getOAIVersion() >= 200)){
-      output << "        <dc:" << label << ">" << values[item] << "</dc:" << label << ">\n";
+    if (this->oaiConfigure->getOAIVersion() >= 200) { // TODO: GRB: This code may need to be subclassed by dc for 200 and later...
+      output << "        <" << this->formatPrefix() << ":" << label << ">" << values[item] << "</" << this->formatPrefix() << ":" << label << ">\n";
     }
     else {
@@ -50 +50 @@
   while (here != end) {
     start = last = here->first.begin();
-    last += this->formatPrefix().size(); // Move last so that it is one place beyond where the "." should be.
-    metaItem = substr(start, last);      // Gets the substring starting at start and going up to (but
-                                         // not including) last. This should be "dc." (for example)
-    
+
+    if (here->first.size() < this->formatPrefix().size() ||
+    here->first[this->formatPrefix().size()] != '.') {
+      metaItem == "";
+    }
+    else {
+      last += this->formatPrefix().size() + 1; // Move last so that it is one place beyond where the "." should be.
+      metaItem = substr(start, last);          // Gets the substring starting at start and going up to (but
+                                               // not including) last. This should be "dc." (for example)
+    }
+
     if (metaItem == this->formatPrefix()) {
       metaItem = substr(last, here->first.end()); // Get the rest of the metadata tag (it's name)

trunk/gsdl/src/oaiservr/oaiconfig.cpp

@@ -120 +120 @@
     this->collectMap[this->collection]->fieldMap[index] = name;
     
-    //    cerr << "Mapping " << index << " to " << name << " in " << this->collection << endl;
+    // cerr << "Mapping " << index << " to " << name << " in " << this->collection << endl;
     
     // TODO: check that the mapped field is actually in use

trunk/gsdl/src/oaiservr/oaitools.cpp

@@ -19 +19 @@
       gsdl_id = response.docInfo[0].OID;
     }
-    else         // Response.docInfo is empty, meaning the doc in question didn't have an oai_id number.
+    else {
+      // Response.docInfo is empty, meaning the doc in question didn't have an oai_id number.
       return gsdl_id; // Return the empty string to indicate this.
+    }
   }
 

trunk/gsdl/src/oaiservr/resumptiontoken.cpp

@@ -113 +113 @@
   }
   reply = reply + ",";
+  cout << "OK" << flush;
   reply.append(this->startItem);
   reply = reply + "-" + buildDate;

trunk/gsdl/src/oaiservr/rfc1807.cpp

@@ -7 +7 @@
 
 const text_t rfc1807::formatPrefix() {
-  return "rfc1807.";
+  return "rfc1807";
 }