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

Timestamp:

2017-08-21T18:03:37+12:00 (7 years ago)

Author:

ak19

Message:

Now GS3 tries to obtain the _earliesttimestamp entry of the oai-inf.db for each collection to, work out the earliest among them to be the earliest timestamp of the repository. For each collection, if there is no such entry or the oai-inf db doesn't exist or can't be accessed, the collection falls back to using the value in the build config file as before. Also as before, if that doesn't exist either, it uses the lastmod date of the collection (I think also taken from build config) as the next fallback value.

File:

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

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

@@ -161 +161 @@
     if (token.indexOf(":") != -1) {
       token = token.substring(0, token.indexOf(":"));
-      logger.error("looking up "+token);
+      logger.info("looking up "+token);
     }
     if (stored_tokens.containsKey(token)) {
@@ -174 +174 @@
     if (token.indexOf(":") != -1) {
       base_name = token.substring(0, token.indexOf(":"));
-      logger.error("getting data for "+base_name);
+      logger.info("getting data for "+base_name);
     }
     HashMap<String, String> data = new HashMap<String, String>(stored_tokens.get(base_name));
     if (data == null) { 
-      logger.error("data was null!!");
+      logger.warn("data was null!!");
       return null;
     }
@@ -211 +211 @@
     Iterator<Map.Entry<String,Long>> i = token_set.iterator();
     int size = expiration_data.size();
-    logger.error("start tokens "+size);
+    logger.info("start tokens "+size);
     Long time_now = System.currentTimeMillis();
     while (i.hasNext()==true) {
@@ -218 +218 @@
       Long exp = entry.getValue();
       if (exp < time_now) {
-    logger.error("token "+key+" is expired, "+ OAIXML.getTime(exp));
+    logger.info("token "+key+" is expired, "+ OAIXML.getTime(exp));
     i.remove();
     // also remove the token from the stored tokens
@@ -225 +225 @@
     }
     size = expiration_data.size();
-    logger.error("end tokens "+size);
+    logger.info("end tokens "+size);
   }
 
@@ -242 +242 @@
       }
     } catch (Exception e) {
-      logger.error("couldn't find or ResumptionToken.xml "+e.getMessage());
+      logger.error("couldn't find or work with ResumptionToken.xml "+e.getMessage());
     }
     // if we have got here, have't managed to load file via class loader -
@@ -287 +287 @@
     clearExpiredTokens();
     if (resumption_token_file == null) {
-      logger.error("no available resumption token file, not storing tokens");
+      logger.warn("no available resumption token file, not storing tokens");
       return false;
     }