Changeset 24007 for main/branches/64_bit_Greenstone/greenstone3/src/java/org/greenstone/gsdl3/util/OAIXML.java

Timestamp:

2011-05-09T14:37:04+12:00 (13 years ago)

Author:

sjm84

Message:

Updating this branch to match the latest Greenstone3 changes

Location:

main/branches/64_bit_Greenstone/greenstone3

Files:

• . (modified) (1 prop)
• src/java/org/greenstone/gsdl3/util/OAIXML.java (modified) (9 diffs)

main/branches/64_bit_Greenstone/greenstone3/src/java/org/greenstone/gsdl3/util/OAIXML.java

@@ -112 +112 @@
     public static final String OAI = "OAI";
     public static final String OAI_DASH_PMH = "OAI-PMH";
+    public static final String OAI_LASTMODIFIED = "oailastmodified";
     public static final String OAIPMH = "OAIPMH";
     public static final String OAI_RESUMPTION_TOKENS = "OAIResumptionTokens";
@@ -161 +162 @@
     //stores the date format "yyyy-MM-ddTHH:mm:ssZ"
     public static String granularity = "";
+
+    // http://www.openarchives.org/OAI/openarchivesprotocol.html#DatestampsRequests 
+    // specifies that all repositories must support YYYY-MM-DD (yyyy-MM-dd in Java)
+    // this would be in addition to the other (optional) granularity of above that 
+    // a repository may additionally choose to support.
+    public static final String default_granularity = "yyyy-MM-dd";
+
     //this value is overriden in getOAIConfigXML()
     public static long token_expiration = 7200;
@@ -232 +240 @@
         Element token_elem = (Element)tokens.item(i);
         String expire_str = token_elem.getAttribute(EXPIRATION_DATE);
-        long datestamp = getTime(expire_str);
+        long datestamp = getTime(expire_str); // expire_str is in milliseconds
         if(datestamp < System.currentTimeMillis()) {
           resumption_token_elem.removeChild(token_elem);
@@ -312 +320 @@
       //initialize the granu_str which might be used by other methods (eg, getDate())
       granularity = GSXML.getNodeText(granu_elem).trim();
+
       //change "yyyy-MM-ddTHH:mm:ssZ" to "yyyy-MM-dd'T'HH:mm:ss'Z'"
       granularity = granularity.replaceAll("T", "'T'");
@@ -352 +361 @@
     
     public static long getTokenExpiration() {
-      return token_expiration*1000;
+    return token_expiration*1000; // in milliseconds
     }
 
@@ -462 +471 @@
         date = sdf.parse(pattern);
       } catch(Exception e) {
-        logger.error("invalid date format: " + pattern);
-        return null;
+      if(!default_granularity.equals(granularity)) { // try validating against default granularity
+          try {
+          date = null;
+          sdf = null;
+          sdf = new SimpleDateFormat(default_granularity);
+          date = sdf.parse(pattern);
+          } catch(Exception ex) {
+          logger.error("invalid date format: " + pattern);
+          return null;
+          }
+      } else {
+          logger.error("invalid date format: " + pattern);
+          return null;
+      }
       }
       return date;
@@ -481 +502 @@
         date = sdf.parse(pattern);
       } catch(Exception e) {
-        logger.error("invalid date format: " + pattern);
-        return -1;
+      if(!default_granularity.equals(granularity)) { // try validating against default granularity
+          try {
+          date = null;
+          sdf = null;
+          sdf = new SimpleDateFormat(default_granularity);
+          date = sdf.parse(pattern);
+          } catch(Exception ex) {
+          logger.error("invalid date format: " + pattern);
+          return -1;
+          }
+      } else {
+          logger.error("invalid date format: " + pattern);
+          return -1;
+      }        
       }
       return date.getTime();
@@ -488 +521 @@
     /** get the string representation of a time from a long value(long type)
      */
-    public static String getTime(long seconds) {
-      Date date = new Date(seconds);
+    public static String getTime(long milliseconds) {
+      Date date = new Date(milliseconds);
       SimpleDateFormat sdf = new SimpleDateFormat(granularity);
       return sdf.format(date);
@@ -504 +537 @@
         oai.setAttribute("xmlns", "http://www.openarchives.org/OAI/2.0/");
         oai.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
-        oai.setAttribute("xsi:schemaLocation", "http://www.openarchives.org/OAI/2.0 \n http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd");
+        oai.setAttribute("xsi:schemaLocation", "http://www.openarchives.org/OAI/2.0/ \n http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd");
       } else {
         oai.setAttribute("xmlns", "http://www.openarchives.com/OAI/1.1/OAI_" + verb);