Changeset 31387 for main/trunk/greenstone2/runtime-src/src/oaiservr/oaiaction.cpp

Timestamp:

2017-02-08T18:31:18+13:00 (7 years ago)

Author:

ak19

Message:

Round 1 of commits for getting OAI deletion policy to work with GS2 (server end). The perl code writing out the OAI db and the GS3 server code implementing the deletion policy had already been completed earlier (end 2016).

File:

• main/trunk/greenstone2/runtime-src/src/oaiservr/oaiaction.cpp (modified) (4 diffs)

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

@@ -403 +403 @@
 
 void oaiaction::output_record_header(ostream &output, const text_t &oaiLabel, const text_t &lastModified, 
-                     const text_tarray &memberOf, int oaiVersion)
-{
+                     const text_t &deleted_status, const text_tarray &memberOf, int oaiVersion)
+{
+  if(deleted_status == "D") { // record marked as deleted
+    output << "    <header status=\"deleted\">" << endl;
+  } else { // deleted_status is "" or E for exists
     output << "    <header>" << endl;
+  }
     output << "      <identifier>" << oaiLabel     << "</identifier>" << endl;
     output << "      <datestamp>"  << lastModified << "</datestamp>" << endl;
@@ -443 +447 @@
 }
 
+// Method that looks for the requested metaname in the doc_info, and if found, sets the value
+// in the argument 'metavalue'.
+void oaiaction::getMeta(ResultDocInfo_t &doc_info, const text_t &metaname, text_t &metavalue)
+{
+  text_t current_metaname;
+
+  //ofstream         logout("oai.log", ios::app);
+
+  MetadataInfo_tmap::iterator current = doc_info.metadata.begin();
+  MetadataInfo_tmap::iterator end = doc_info.metadata.end();
+
+  while(current != end){
+    current_metaname = current->first;
+    lc(current_metaname); // lowercased for string comparison below
+
+    if (current_metaname == metaname && current->second.values.size() >= 1) { // found match with a value
+      metavalue = current->second.values[0];
+
+      //logout << "Looking for metaname = " << current_metaname << endl;
+      //logout << "\t\t\t Found value = " << metavalue << endl;
+      return; // done
+    }
+
+    ++current;
+  }
+
+  //logout.close();
+}
+
 void oaiaction::getLastModifiedDate(ResultDocInfo_t &doc_info, text_t &lastModified)
 {
@@ -460 +493 @@
     }
     else{ 
-      if (temp == "oailastmodified" && lastModified == "" && current->second.values.size() >= 1) {
-    lastModified = current->second.values[0];
-    time_t raw_time = (time_t)lastModified.getint();
-    lastModified = this->parseDatestamp(raw_time);
+      if(lastModified == "" && current->second.values.size() >= 1) {
+
+    if (temp == "oaiinf.timestamp") { // new way is to store oai timestamp in oai db and get it from there
+      // check if there was a timestamp for the doc in the etc/oai-inf database
+      lastModified = current->second.values[0];
+    
+    } else if (temp == "oailastmodified") { // old way, being phased out
+      // check if there was an oailastmodified timestamp for the doc in the collection index db
+      lastModified = current->second.values[0];
+    }
+
+    if(lastModified != "") { // if we've now set the lastModified value, convert it for display and return
+      time_t raw_time = (time_t)lastModified.getint();
+      lastModified = this->parseDatestamp(raw_time);
+    
+      return;
+    }
       }
-    }
+    } // else keep looking for oai timestamp
     ++current;
   }  
+
 }
 
@@ -475 +522 @@
   FilterResponse_t response;
   text_tset        metadata;
-  bool status_ok = get_info(OID, collection, "", metadata, false, protocol, response, logout);
+  bool status_ok = get_oai_info(OID, collection, "", metadata, false, protocol, response, logout);
+     // get timestamp from etc/oai-inf.<db> now, no longer from index.db
   bool not_too_early = false, not_too_recent = false;