Changeset 31903 for main/trunk/greenstone2/runtime-src/src/colservr/collectserver.cpp

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.

File:

• main/trunk/greenstone2/runtime-src/src/colservr/collectserver.cpp (modified) (2 diffs)

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 "".