Changeset 24114 for main/trunk/greenstone2/runtime-src/src/oaiservr/oaiconfig.cpp

Timestamp:

2011-06-03T22:44:28+12:00 (13 years ago)

Author:

ak19

Message:

Now GS2 works out the earliestDatestamp of the repository in the manner GS3 does it (read each OAI-enabled collection's build.cfg to get the collection's earliestDatestamp field and choose the oldest such date among the OAI collections). Previously GS2 used to always set the earliestDatestamp to the unix epoch of 1970, which, while it would validate, wasn't the right thing to do as it wouldn't help with resumptiontokens and other date based things. Checked that the GS server still validates.

File:

• main/trunk/greenstone2/runtime-src/src/oaiservr/oaiconfig.cpp (modified) (3 diffs)

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

@@ -83 +83 @@
     if (!this->configureCollection(gsdlhome, *here)) {
       this->collectList.erase(here);
-    }
-    
+    }   
   }
   else {
@@ -119 +118 @@
   if (!file_exists(cnfgfile)) {
     return false;
-  }
+  }  
+  
   this->collection = gsdlcollect;
   this->read_configfile(cnfgfile);
-
+  
+  // to work out the earliestDatestamp for the repository, need to
+  // to read in the build.cfg file of each OAI collection, in order to
+  // find the oldest earliestDatestamp field of all the OAI collections
+  text_t buildcnfgfile = filename_cat(gsdlhome, "collect", gsdlcollect, "index", "build.cfg");
+  if (file_exists(buildcnfgfile)) {
+    this->read_configfile(buildcnfgfile);
+  }
+  
   return true;
 }
@@ -309 +317 @@
     this->oaiVersion = cfgline[0];
   }
-  
-}
+}
+
 
 text_t oaiconfig::generateBaseServerURL() {