Changeset 23922

Timestamp:

2011-04-18T19:39:15+12:00 (13 years ago)

Author:

ak19

Message:

Two fixes: 1. Dr Bainbridge noticed the Date object used in OAIXML.java's getTime() accepted time in milliseconds, not seconds as the long parameter contained when called from OAIPMH (other classes calling OAIXML.getTime() called it correctly in milliseconds. 2. Fixed error in OAIServer.getPost where I wasn't resetting the new member variable queryString, which was breaking future doGet requests.

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• OAIServer.java (modified) (2 diffs)
• service/OAIPMH.java (modified) (3 diffs)
• util/OAIXML.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/OAIServer.java

@@ -288 +288 @@
     // if called by doPost (if this was originally a POST request), var queryString would have been set
     String query = (queryString == null) ? request.getQueryString() : queryString;
+    queryString = null; // reset member variable, else no doGet will work as long as the server remains running
+
     String[] pairs = (query==null)? null : query.split("&");//split into key/value pairs
     String verb = getVerb(query);
@@ -413 +415 @@
       if(queryString.length() > 0) {
       queryString = queryString.substring(1);
-      //queryString = java.net.URLEncoder.encode(queryString,"UTF-8");
+      //queryString = OAIXML.oaiEncode(queryString);
       }
       if(queryString.equals("")) {

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

@@ -256 +256 @@
     if(keys.contains(OAIXML.LASTMODIFIED)) {
       lastmodified = info.getInfo(OAIXML.LASTMODIFIED);
-    }
-    lastmodified = OAIXML.getTime(Long.parseLong(lastmodified));
+      lastmodified = OAIXML.getTime(Long.parseLong(lastmodified)*1000); // java wants dates in milliseconds
+    }
 
     Element get_record = OAIXML.createElement(OAIXML.GET_RECORD);
@@ -335 +335 @@
       if(keys.contains(OAIXML.LASTMODIFIED)) {
         lastmodified = info.getInfo(OAIXML.LASTMODIFIED);
-      }
-      lastmodified = OAIXML.getTime(Long.parseLong(lastmodified));
+    lastmodified = OAIXML.getTime(Long.parseLong(lastmodified)*1000); // java wants dates in milliseconds
+      }
       
       Date this_date = OAIXML.getDate(lastmodified);        
@@ -421 +421 @@
       if(keys.contains(OAIXML.LASTMODIFIED)) {
         lastmodified = info.getInfo(OAIXML.LASTMODIFIED);
-      }
-      lastmodified = OAIXML.getTime(Long.parseLong(lastmodified));
+    lastmodified = OAIXML.getTime(Long.parseLong(lastmodified)*1000); // java wants dates in milliseconds
+      }
       
       Date this_date = OAIXML.getDate(lastmodified);        

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

@@ -239 +239 @@
         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);
@@ -360 +360 @@
     
     public static long getTokenExpiration() {
-      return token_expiration*1000;
+    return token_expiration*1000; // in milliseconds
     }
 
@@ -520 +520 @@
     /** 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);