Changeset 23938 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

Timestamp:

2011-04-20T21:02:12+12:00 (13 years ago)

Author:

ak19

Message:

GS3's OAIserver passes final official oaiserver validation tests: to do with earliestDatestamp. Both the datestamp of the records (documents) returned by listRecords, listIdentifiers and getRecord, as well as the earliestDatestamp returned by an Identify request are now in sync with each other. Related code changes made to perllib to write the earliestDatestamp into GS3's buildconfig.xml (and build.cfg for GS2), and to write new fields oailastmodified and oailastmodifieddate into the collection's database for each document.

File:

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

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

@@ -68 +68 @@
     /** time when this collection was built */
     protected long lastmodified = 0;
-    
+    /** earliestDatestamp of this collection. Necessary for OAI */
+    protected long earliestDatestamp = 0;
+
+
     /** An element containing the serviceRackList element of buildConfig.xml, used to determine whether it contains
      *  the OAIPMH serviceRack 
@@ -133 +136 @@
     return is_public;
     }
-    //used by the OAIReceptionist to find out the earliest datestamp amongst all oai collections in the repository
+    // Not used anymore by the OAIReceptionist to find out the earliest datestamp 
+    // amongst all oai collections in the repository. May be useful generally.
     public long getLastmodified() {
       return lastmodified;
     }
+    //used by the OAIReceptionist to find out the earliest datestamp amongst all oai collections in the repository
+    public long getEarliestDatestamp() {
+    return earliestDatestamp;
+    }
+
     /** whether the service_map in ServiceCluster.java contains the service 'OAIPMH'
      *  11/06/2007 xiao
@@ -179 +188 @@
         build_config_elem = build_config_doc.getDocumentElement();
     }
-  
+
     lastmodified = build_config_file.lastModified();
   
@@ -264 +273 @@
       } else {
     has_oai = true;
+    
+    // extract earliestDatestamp from the buildconfig.xml for OAI
+    Element metadata_list = (Element)GSXML.getChildByTagName(build_config_xml, GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+
+    if(metadata_list != null) {
+        NodeList children = metadata_list.getElementsByTagName(GSXML.METADATA_ELEM); 
+               // can't do getChildNodes(), because whitespace, such as newlines, creates Text nodes
+        for (int i = 0; i < children.getLength(); i++) {
+        Element metadata = (Element)children.item(i);
+        if(metadata.getAttribute(GSXML.NAME_ATT).equals(OAIXML.EARLIEST_DATESTAMP)) {
+            String earliestDatestampStr = GSXML.getValue(metadata);
+            if(!earliestDatestampStr.equals("")) {
+            earliestDatestamp = Long.parseLong(earliestDatestampStr);
+            }
+            break; // found a metadata element with name=earliestDatestamp in buildconfig
+        }
+        }
+    }
+    
+    // If at the end of this, there is no value for earliestDatestamp, print out a warning
+    logger.warn("No earliestDatestamp in buildConfig.xml for collection: " + this.cluster_name + ". Defaulting to 0.");
+
       }
     } else { // no list of services (no ServiceRackList), so no oai_service_rack either