Changeset 29267

Timestamp:

2014-09-11T13:32:53+12:00 (10 years ago)

Author:

kjdon

Message:

allow users to manually set a record's date stamp by setting gs.OAIDateStamp metadata

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/OAIPMH.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/OAIPMH.java

@@ -345 +345 @@
     Document doc = XMLConverter.newDOM();
     ArrayList<String> keys = new ArrayList<String>(info.getKeys());
-    String oailastmodified = info.getInfo(OAIXML.OAI_LASTMODIFIED);
-    if (!oailastmodified.equals("")) {
-      // format into a string
-      oailastmodified = OAIXML.getTime(Long.parseLong(oailastmodified)*1000); // java wants dates in milliseconds
+    long millis = getDateStampMillis(info);
+    String oailastmodified = ""; 
+    if (millis != -1) {
+      oailastmodified = OAIXML.getTime(millis);
     }
 
@@ -444 +444 @@
       }
       
-      String oailastmodified = info.getInfo(OAIXML.OAI_LASTMODIFIED);
-      long oailastmodifiedmillis = 0;
+      long millis = getDateStampMillis(info);
       Date this_date = null;
-      if (oailastmodified.equals("")) {
+      if (millis == -1) {
     if (from_date != null || until_date !=null) {
       continue; // if this doc doesn't have a date for some reason, and
       // we are doing a date range, then don't include it.
     }
-      } else { // check the date against date range from query (if any)
-    oailastmodifiedmillis = Long.parseLong(oailastmodified)*1000; // greenstone dates are in secods, and Java wants dates in milliseconds
-    this_date = new Date(oailastmodifiedmillis); 
- 
+      } else {
+    this_date = new Date(millis);
     if (from_date != null) {
       if(this_date.before(from_date)) {
@@ -467 +464 @@
     }    
       }  
+ 
       //Now check that this id has metadata for the required prefix.
       if (documentContainsMetadata(info, set_of_elems)) {
@@ -475 +473 @@
       list_items.appendChild(record);
       //compose the header element
-      record.appendChild(createHeaderElement(doc, oid, OAIXML.getTime(oailastmodifiedmillis)));      
+      record.appendChild(createHeaderElement(doc, oid, OAIXML.getTime(millis)));      
       //compose the metadata element
       record.appendChild(createMetadataElement(doc, prefix, info));
     } else {
       //compose the header element and append it
-      list_items.appendChild(createHeaderElement(doc, oid, OAIXML.getTime(oailastmodifiedmillis)));      
+      list_items.appendChild(createHeaderElement(doc, oid, OAIXML.getTime(millis)));      
     }
       } // otherwise we won't include this oid.
@@ -741 +739 @@
   }
 
+  protected long getDateStampMillis(DBInfo info) {
+    // gs.OAIDateStamp is in YYYY-MM-DD
+    String time_stamp = info.getInfo(OAIXML.GS_OAI_DATE_STAMP);
+    long millis = -1;
+    if (!time_stamp.equals("")) {
+      millis = OAIXML.getTime(time_stamp);
+    }
+    if (millis == -1) {
+      // oailastmodified is in seconds
+      time_stamp = info.getInfo(OAIXML.OAI_LASTMODIFIED);
+      if (!time_stamp.equals("")) {
+    millis = Long.parseLong(time_stamp)*1000;
+      }
+    }
+    return millis;
+    
+
+  }
 }