Changeset 24109 for main/trunk/greenstone2/runtime-src/src

Timestamp:

2011-06-01T19:12:33+12:00 (13 years ago)

Author:

ak19

Message:

Still on changes for OAIserver: oailastmodified date is now used instead of lastmodified, making it similar to GS3's more correct approach.

Location:

main/trunk/greenstone2/runtime-src/src/oaiservr

Files:

• abstractlistaction.cpp (modified) (1 diff)
• oaiaction.cpp (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/oaiservr/abstractlistaction.cpp

@@ -225 +225 @@
   get_top(oai_OID, document_OID);
 
-  // Request the lastmodified value for this document
+  // Request the oailastmodified value for this document
   text_tset metadata;
-  metadata.insert("lastmodified");
+  metadata.insert("oailastmodified");
   metadata.insert("gs.OAIDateStamp");
   FilterResponse_t response;

main/trunk/greenstone2/runtime-src/src/oaiservr/oaiaction.cpp

@@ -438 +438 @@
   while(current != end){
     temp = current->first;
-    lc(temp);
-    if(temp == "gs.oaidatestamp"){
-      // assume it is correct format
-      lastModified = current->second.values[0];
-      if(lastModified != "") {
-            return;
-      }
+    lc(temp); // lowercased for string comparison below
+    if(temp == "gs.oaidatestamp" && current->second.values[0] != "") { // user specified a (non-empty) oaidatestamp as gs metadata
+        // assume it is correct format
+        lastModified = current->second.values[0];
+        return;
     }
     else{ 
-      if (temp == "lastmodified" && lastModified == "" && current->second.values.size() >= 1) {
+      if (temp == "oailastmodified" && lastModified == "" && current->second.values.size() >= 1) {
     lastModified = current->second.values[0];
     time_t raw_time = (time_t)lastModified.getint();