Changeset 28880 for main/trunk

Timestamp:

2014-03-06T14:05:12+13:00 (10 years ago)

Author:

kjdon

Message:

added a field in data for initial time that resumption token started - so we can check if a collection has changed since the token was issued. Currently just the token name as the current time is used for token name. added method to manually expire a token - if a collection has changed since the token was issued that expire the token as they should reissue the request from the beginning.

File:

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

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

@@ -49 +49 @@
   public static final String NAME = "name";
   public static final String EXPIRATION = "expiration";
+  public static final String INITIAL_TIME = "initial";
   //public static final String FROM
   public static final String FILE_SEPARATOR = File.separator;
@@ -189 +190 @@
       data.put(CURRENT_SET, parts[2]);
       data.put(CURRENT_CURSOR, parts[3]);
+      data.put(INITIAL_TIME, base_name);
     }
     return data;
@@ -194 +196 @@
   }
 
+  // used to manually expire a particular token - eg when one of its collections has changed since token was issued.
+  public static void expireToken(String token) {
+    if (token.indexOf(":") != -1) {
+      token = token.substring(0, token.indexOf(":"));
+    }
+    expiration_data.remove(token);
+    stored_tokens.remove(token);
+  }
   // read through all stored expiry dates, and delete any tokens that are too
   // old