Changeset 23913 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util

Timestamp:

2011-04-16T20:16:19+12:00 (13 years ago)

Author:

ak19

Message:

Additional changes to succeed in more of the OAIServer validation tests: 1. Now passes POST requests introduced in OAI version 2.0. 2. Passes further error tests regarding handling of erroneous parameters for From and/or Until dates and ResumptionToken. More (major) changes yet to be made to pass the final official OAIServer validation test: to do with earliestDateStamp.

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/OAIXML.java

@@ -161 +161 @@
     //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;
@@ -312 +319 @@
       //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'");
@@ -462 +470 @@
         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 +501 @@
         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();