Changeset 1138 for OAIHarvester

Timestamp:

02/22/11 13:40:34 (13 years ago)

Author:

oschonef

Message:

• minor fix for internal bookkeeping in OAI flow control case

File:

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

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

@@ -82 +82 @@
         }
 
-        boolean success;
+        boolean ok;
         try {
             switch (job.getTask()) {
             case IDENTIFY_REPOSITORY:
-                success = doIdentifyTask(job);
-                if (success) {
+                ok = doIdentifyTask(job);
+                if (ok) {
                     job.setTask(Task.ENUMERATE_METADATA_FORMATS);
                 }
                 break;
             case ENUMERATE_METADATA_FORMATS:
-                success = doListMetadataFormatsTask(job);
-                if (success) {
+                ok = doListMetadataFormatsTask(job);
+                if (ok) {
                     job.setTask(Task.HARVEST_RECORDS);
                 }
@@ -102 +102 @@
                     job.onStartListingRecords();
                 }
-                success = doListRecordsTask(job);
-                if (success) {
+                ok = doListRecordsTask(job);
+                if (ok) {
                     // notify end of prefix
                     job.onFinishListingRecords();
@@ -109 +109 @@
                         job.setState(State.DONE);
                     }
+                } else if ((job.getResumptionToken() != null) && (delay == 0)) {
+                    /*
+                     * special case: request successfull, but list was split
+                     * die to OAI flow control
+                     */
+                    ok = true;
                 }
                 break;
@@ -115 +121 @@
             } // switch
 
-            if (success) {
+            if (ok) {
                 job.resetNetworkRequestCount();
             } else {