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

Timestamp:

2017-08-18T19:28:42+12:00 (6 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.

File:

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

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

@@ -551 +551 @@
 }
 
+// works out the earliest date/timestamp of the OAI repository,
+// which compares and then selects the earliest timestamp value among all collections.
+// In the past, the earliest date/timestamp used to be the unix epoch,
+// later it became the earliest among each collection's builddate in build.cfg,
+// and now, after implementing the OAI deletion policy, it needed to become the earliest
+// among each collection's OAI_EARLIESTTIMESTAMP_OID record's timestamp value.
+
 text_t oaiaction::calcEarliestDatestamp(recptproto *protocol, oaiargs &params) {
     
@@ -570 +577 @@
     // (the earliestDatestamp for a collection has already been extracted from 
     // their build.cfg file at this point by collectserver::configure. The field
-    // is declared in comtypes.h)   
-    
+    // is declared in comtypes.h)
+    
+    // We've changed this again to grab the timestamp field of the OAI_EARLIESTTIMESTAMP_OID
+    // record of each collection's oai-inf.db (representing the time that collection was
+    // built for the very first time) and choosing the earliest among all of them.
     
     // Get a list of the OAI-enabled collections available
@@ -597 +607 @@
             collection_iterator++;
         }
+
+        ofstream         logout("oai.log", ios::app);
         
         // Now loop through the remaining collections
@@ -604 +616 @@
             collection_name = (*collection_iterator);
             
+            text_tset        metadata;
+            FilterResponse_t response;
+
+            // get timestamps from etc/oai-inf.<db> now, no longer from build.cfg
+            // request the special record with OID=OAI_EARLIESTTIMESTAMP_OID for the collection
+            bool status_ok = get_oai_info(OAI_EARLIESTTIMESTAMP_OID, collection_name, "", metadata, false, protocol, response, logout);
+            
+            if(status_ok) {
+              ResultDocInfo_t doc_info = response.docInfo[0];
+              text_t collEarliestTimestamp;
+              // the timestamp we want lives in the "lastmodified" field of the OAI_EARLIESTTIMESTAMP_OID record
+              this->getLastModifiedDate(doc_info, collEarliestTimestamp);
+              
+              if(earliestDatestamp == "") { // first earliestdatestamp we've seen for an oai collection
+                earliestDatestamp = collEarliestTimestamp;
+              } else if(collEarliestTimestamp < earliestDatestamp) {
+                earliestDatestamp = collEarliestTimestamp;
+              }
+            } /*else { // collection may not have oai-inf.db (yet), check build.cfg?
+                // No: no need to use the old way as fallback
+               
             ColInfoResponse_t cinfo;
             comerror_t err; 
@@ -618 +651 @@
                 }
             }
+              }
+              */
             collection_iterator++;
             
-        }       
+        }
+        logout.close();
     }