Changeset 31915 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/OAICollection.java

Timestamp:

2017-08-23T18:58:38+12:00 (7 years ago)

Author:

ak19

Message:

Dr Bainbridge thought about it and decided that the correct solution is that, since a collection will always have an oai-inf db from now on, the earliest datestamp of a collection should not fall back to either buildconfig's earliestdatestamp field or else buildconfig's lastmodified. However, the latter are used as the publishing date by the RSS service, and so still stored as Collection.java's earliestDatestamp. Now OAICollection has a new additional field, earliestOAIDatestamp which contains the earliest timestamp in oai-inf db. The OAIReceptionist now determines the earliestDatestamp of the entire OAIRepository solely based on the earliestOAIDatestamp values across all OAICollections, also with no fallbacks on Collections' earliestDatestamp or lastModified fields.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/OAICollection.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/OAICollection.java

@@ -61 +61 @@
     protected boolean has_oai = false;
 
-  /** a reference to the OAIPMH service rack */
-  protected OAIPMH oai_service_rack = null;
+    /** earliest datestamp of an OAI collection. Also used to work out the earliest datetimestamp of the entire OAI repository */
+    protected long earliestOAIDatestamp = 0;
+
+    /** a reference to the OAIPMH service rack */
+    protected OAIPMH oai_service_rack = null;
 
     /**
@@ -120 +123 @@
     }
 
+    /**
+     * The earliesttimestamp entry in the oai-inf.db representing when the collection was created.
+     * Used by the OAIReceptionist
+    */   
+    public long getEarliestOAIDatestamp()
+    {
+        return earliestOAIDatestamp;
+    }
+    
   /** add any extra info for collection from OAIConfig.xml */
   public boolean configureOAI(Element oai_config) {
@@ -152 +164 @@
 
           // once we've configured the OAIPMH service, we can use the OAIPMH service to
-          // retrieve the earliest timestamp of the collection from the oai-inf db and
-          // overwrite Collection.earliestDatestamp with it.
+          // retrieve the earliest timestamp of this OAI collection from the oai-inf db
           long earliestTimestamp = this.oai_service_rack.getEarliestTimestamp();
           if(earliestTimestamp == -1) {
-          //this.earliestDatestamp = -1;
-          logger.warn("No OAI timestamp for collection " + this.cluster_name
-                  + ". Falling back to using its earliestDatestamp from build config: " + this.earliestDatestamp);
+          this.earliestOAIDatestamp = -1;
+          logger.warn("No OAI timestamp for collection " + this.cluster_name);
+          //logger.warn("No OAI timestamp for collection " + this.cluster_name
+          //+ ". Falling back to using its earliestDatestamp from build config: " + this.earliestDatestamp);
           } else {
-          this.earliestDatestamp = earliestTimestamp; // milliseconds
+          this.earliestOAIDatestamp = earliestTimestamp; // milliseconds
           }