Changeset 3021 for OAIHarvester

Timestamp:

06/11/13 22:15:50 (11 years ago)

Author:

oschonef

Message:

• creative hanbdling of resumptionToken for non-conforming OAI providers

File:

• OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/HarvestWorker.java (modified) (3 diffs)

OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/HarvestWorker.java

@@ -359 +359 @@
             }
 
-            String nextToken = null;
-
             response.readStart(OAI_NS, "ListRecords", true);
             header.reset();
@@ -416 +414 @@
              * expect resumptionToken (possibly empty) when request was resumed
              */
-            if (response.readStart(OAI_NS, "resumptionToken",
-                    (token != null), true)) {
+            String nextToken = null;
+            boolean got_token = false;
+            if (response.readStart(OAI_NS, "resumptionToken", false, true)) {
                 // XXX: read attributes here!
                 response.consumeStart();
@@ -423 +422 @@
                 nextToken = response.readString(false);
                 if (nextToken != null) {
-                    job.setResumptionToken(nextToken);
+                    if (!nextToken.isEmpty()) {
+                        job.setResumptionToken(nextToken);
+                    } else {
+                        nextToken = null;
+                    }
                 }
                 response.readEnd(OAI_NS, "resumptionToken");
+                got_token = true;
+            }
+            if ((token != null) && (nextToken == null) && !got_token) {
+                logger.error("An <resumptionToken> element was expected, " +
+                        "but none was found; assuming a complete result list.");
+                logger.error("An OAI provider is required to serialize an " +
+                        "empty <resumptionToken> element to announce that " +
+                        "the result list is complete.");
             }
             response.readEnd(OAI_NS, "ListRecords");