Changeset 31903 for main/trunk/greenstone2/runtime-src/src/colservr

Timestamp:

2017-08-18T19:28:42+12:00 (7 years ago)

Author:

ak19

Message:

I hope these are all the changes necessary on the runtime side of GS2 to get the OAI server validation working for GS2: instead of working out the earliest datetime stamp of the OAI repository by comparing the builddate in index/build.cfg of each OAI collection and selecting the earliest, the oai-inf.db is now storing the special earliesttimestamp record. The timestamp of this record represents its collection's earliest timestamp. And the earliest of these among all OAI collections is now the earliest datetime of the OAI repository.

Location:

main/trunk/greenstone2/runtime-src/src/colservr

Files:

• browsefilter.cpp (modified) (2 diffs)
• collectserver.cpp (modified) (2 diffs)
• comtypes.h (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/colservr/browsefilter.cpp

@@ -143 +143 @@
     if(parentnode == "oai") { // doing an OAI listidentifiers request
 
-      // open up the oai-inf db, if it exists, and return all IDs
-      // if it doesn't exist, proceed as usual
+      // open up the oai-inf db if it exists, and return all IDs *except* the special OID=OAI_EARLIESTTIMESTAMP_OID
+      // if oai-inf db doesn't exist, proceed as usual
       success = get_oaiinf_db_entries(response, err, logout); //adds any stuff in oai-inf db for the current OID to resultdoc.metadata
 
@@ -377 +377 @@
     
     resultdoc.OID = (*key_here);
-   
+    
+    // OAI_EARLIESTTIMESTAMP_OID is the OID of a special record that we'll ignore
+    // here in browsefilter.cpp, since it's not a doc.
+    // When the *metadata* for this special OID is requested, source.cpp will handle it
+    if(resultdoc.OID == OAI_EARLIESTTIMESTAMP_OID) {
+      ++key_here;
+      continue;
+    }
+
     if(!oaidb_ptr->getinfo(resultdoc.OID, oai_info)) {
       logout << text_t2ascii

main/trunk/greenstone2/runtime-src/src/colservr/collectserver.cpp

@@ -535 +535 @@
       // first check for oai metadata from the oai_db, if asked for it (if FROAI is set)
       if(((*source_here).s != NULL) &&
-         request.filterResultOptions & FROAI &&
+         (request.filterResultOptions & FROAI) &&
          ((*source_here).s->get_oai_metadata(request.requestParams, request.refParams,
                          request.getParents, request.fields, 
@@ -546 +546 @@
       }
 
+      // if OID is the special OAI specific OAI_EARLIESTTIMESTAMP_OID,
+      // then we'd have got its OAI meta above if we were requested to do so.
+      // Either way, we won't be additionally getting regular meta for this OID,
+      // as it's not a real doc OID, so we stop processing this OID here.
+      if((*resultdoc_here).OID == OAI_EARLIESTTIMESTAMP_OID) {
+        ++source_here;
+        if(processed == true) break;
+        else continue;
+      }
+  
       // We may or may not have got oai_meta (depends on if FROAI was set).
       // If we didn't get oai_meta, then deleted_status would still be "".

main/trunk/greenstone2/runtime-src/src/colservr/comtypes.h

@@ -48 +48 @@
 #endif
 
+
+const text_t OAI_EARLIESTTIMESTAMP_OID = "earliesttimestamp";
+         // https://www.tutorialspoint.com/cplusplus/cpp_constants_literals.htm
 
 enum comerror_t {noError, authenticationFailure, protocolError, 
@@ -113 +116 @@
   text_tmap      dynamic_classifiers;
   text_t         earliestDatestamp;   // For OAIserver validation. Time since linux Epoch, expressed as (long) integer value in string form
+  // This field stored the builddate value from a collection's index/build.cfg file.
+  // This field earliestDatestamp was used when oaiaction.calcEarliestDatestamp() needed to
+  // determine the earliest timestamp of the repository, by selecting the earliestDatestamp among
+  // all oai collections. Now it's no longer used by OAI, as that resorts to consulting oai-inf.db
+  // of each collection, which has a collection's earliest timestamp stored, to work out the
+  // earliest timestamp among all collections. But the build.cfg builddate stored in the
+  // earliestDatestamp field may still be useful in future for some purpose, so leaving it alone.
+  
 };