enable resumptionToken for openaire correctly

oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java

@@ -473,13 +473,14 @@ public class OAIPMHImpl implements OAIPMHProducer {
             && RecordListDelivererDC.cursorCollector.containsKey(request.getResumptionToken());
         boolean restokIDIOMExisting = RecordListDelivererIDIOM.cursorCollector != null
             && RecordListDelivererIDIOM.cursorCollector.containsKey(request.getResumptionToken());
-        boolean restokOpenAireExisting = OpenAireRecordList.cursorCollector != null
-                && OpenAireRecordList.cursorCollector.containsKey(request.getResumptionToken());
+        boolean restokOpenAireExisting = RecordListDelivererAbstract.cursorCollector != null
+                && RecordListDelivererAbstract.cursorCollector.containsKey(request.getResumptionToken());
         if (restokDCExisting) {
           recListDeliv = this.recordListDC;
         } else if (restokIDIOMExisting) {
           recListDeliv = this.recordListIDIOM;
         } else if (restokOpenAireExisting) {
+          System.out.println("RESTOK FOR OPENAIRE EXISTS");
           recListDeliv = this.openAireRecordList;
         }        
       }      

oaipmh-core/src/main/java/info/textgrid/middleware/OpenAireRecordList.java

@@ -14,7 +14,7 @@ import info.textgrid.middleware.oaipmh.ResumptionTokenType;
 
 public class OpenAireRecordList extends RecordListDelivererAbstract {
 	
-	protected static Map<String, Integer> cursorCollector = new Hashtable<String, Integer>();
+	//protected static Map<String, Integer> cursorCollector = new Hashtable<String, Integer>();
 	
 	
 	private String rangeField;
@@ -60,8 +60,7 @@ public class OpenAireRecordList extends RecordListDelivererAbstract {
 		System.out.println(getResTokenForResponse().getValue());
 		//System.out.println(getResumptionToken());
 		//resTokenForResponse = OAIPMHUtilities.getResumptionToken(
-	    //          94146, resumptionToken, cursorCollector, scrollID, this.searchResponseSize, i)
-		
+	    //          94146, resumptionToken, cursorCollector, scrollID, this.searchResponseSize, i)		
         	openAireRecordList.setResumptionToken(getResTokenForResponse());
         //}
 		

oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java

@@ -134,6 +134,8 @@ public abstract class RecordListDelivererAbstract implements RecordListDeliverer
 		 
 	     resTokenForResponse = OAIPMHUtilities.getResumptionToken(
 	              completeListSize, resumptionToken, cursorCollector, scrollID, this.searchResponseSize, i);
+	     System.out.println("TADA: ");
+	     System.out.println(cursorCollector);
 
 	  }else {
 		  setFoundItems(false);
@@ -166,13 +168,17 @@ public abstract class RecordListDelivererAbstract implements RecordListDeliverer
 
     // Check if resumptionToken is invalid or existing.
     if (request.getResumptionToken() != null) {
+    	System.out.println("ERROR_CHECK");
+    	System.out.println(request.getResumptionToken());
         boolean restokIDIOMExisting = RecordListDelivererIDIOM.cursorCollector != null
             && RecordListDelivererIDIOM.cursorCollector.containsKey(request.getResumptionToken());
         
         boolean restokDCExisting = RecordListDelivererDC.cursorCollector != null
             && RecordListDelivererDC.cursorCollector.containsKey(request.getResumptionToken());
-
-        if (!restokDCExisting && !restokIDIOMExisting) {          
+        boolean restok = cursorCollector != null
+                && cursorCollector.containsKey(request.getResumptionToken());
+        
+        if (!restokDCExisting && !restokIDIOMExisting && !restok) {          
       	  result.setError(TGConstants.OAI_BAD_RESUMPTION_TOKEN, "The value of the "
               + request.getResumptionToken() + " argument is invalid or expired.");
         }

oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java

@@ -274,9 +274,10 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
           completeListSize, resumptionToken, cursorCollector, scrollID, this.searchResponseSize, i);
      
       //if (resTokenForResponse != null) {
-      System.out.println("RESTOKEN: ");
-        System.out.println(recordList.getResumptionToken());
+      
         recordList.setResumptionToken(resTokenForResponse);
+        System.out.println("RESTOKEN: ");
+        System.out.println(recordList.getResumptionToken());
       //}
 
     } else {