Changeset 30034 for main

Timestamp:

2015-07-16T18:42:45+12:00 (9 years ago)

Author:

ak19

Message:

The OAI Validator has added more tests, one of them had failed: when the until date is provided in a request, either on its own or with a from date, the until date should not precede the earliestDatestamp. (Not sure if there are constraints on the from date not exceeding the current time, so I've left that out for now.) Further, the test on until coming on or after earliestDatestamp should be performed after checking that from and until dates' granularities match. Not sure how to make the tests sequence independent when the tests are conducted in sequence.

File:

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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/OAIReceptionist.java

@@ -490 +490 @@
 
       //if there are any date params, check they're of the right format
+      Date from_date = null;
+      Date until_date = null;
+
       from = param_map.get(OAIXML.FROM);
       if(from != null) {    
-    Date from_date = OAIXML.getDate(from);
+    from_date = OAIXML.getDate(from);
     if(from_date == null) {
       logger.error("invalid date: " + from);
@@ -500 +503 @@
       until = param_map.get(OAIXML.UNTIL);
       if(until != null) {   
-    Date until_date = OAIXML.getDate(until);
+    until_date = OAIXML.getDate(until);
     if(until_date == null) {
       logger.error("invalid date: " + until);
@@ -506 +509 @@
     } 
       }    
+
       if(from != null && until != null) { // check they are of the same date-time format (granularity)
     if(from.length() != until.length()) {
@@ -511 +515 @@
       return OAIXML.createErrorMessage(OAIXML.BAD_ARGUMENT, "The request has different granularities (date-time formats) for the From and Until date parameters.");
     }
-      }
+
+    if(from_date.compareTo(until_date) > 0) { // from date can't be later than until date
+        return OAIXML.createErrorMessage(OAIXML.NO_RECORDS_MATCH, "");
+    }
+      }
+      
+      if(until_date != null) {
+      
+      // Also call until_date.compareTo(earliestdatestamp) as the until date can't precede the earliest timestamp
+      // Unfortunately, this test has to be done after the granularity test
+      // compareTo() returns the value 0 if the argument Date is equal to this Date; a value less than 0 if this Date is before 
+      // the Date argument; and a value greater than 0 if this Date is after the Date argument.    
+      long earliestDatestamp = getEarliestDateStamp(collection_list);
+      String earliestDatestamp_str = OAIXML.getTime(earliestDatestamp);
+      Date earliestDatestamp_date = OAIXML.getDate(earliestDatestamp_str);
+      
+      if(until_date.compareTo(earliestDatestamp_date) < 0) {
+          return OAIXML.createErrorMessage(OAIXML.NO_RECORDS_MATCH, "");
+      }
+      }
+      
   
       // check the set arg is a set we know about