chore: add restok logging

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

@@ -51,6 +51,7 @@ public class IdentifierListDelivererDC extends IdentifierListDelivererAbstract {
    * @see info.textgrid.middleware.IdentifierListDelivererInterface#processIdentifierList(java.lang.
    * String, java.lang.String, java.lang.String, java.lang.String)
    */
+  @Override
   public ListIdentifiersType processIdentifierList(String from, String to, String set,
       String resumptionToken) throws IOException, ParseException {
 

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

@@ -7,6 +7,7 @@ import java.text.ParseException;
 import java.util.Hashtable;
 import java.util.Map;
 import javax.xml.datatype.DatatypeConfigurationException;
+import org.apache.jena.atlas.logging.Log;
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.search.SearchRequest;
@@ -260,7 +261,13 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
       // Check the need for a resumption token!
       ResumptionTokenType resTokenForResponse = OAIPMHUtilities.getResumptionToken(completeListSize,
           resumptionToken, cursorCollector, scrollID, this.searchResponseSize, i);
-      recordList.setResumptionToken(resTokenForResponse);
+      if (resTokenForResponse != null) {
+        recordList.setResumptionToken(resTokenForResponse);
+      }
+
+      Log.debug(completeListSize, "complete list size: " + completeListSize);
+      Log.debug(resumptionToken, "resumption token: " + resumptionToken);
+      Log.debug(scrollID, "scroll id: " + scrollID);
 
     } else {
       setFoundItems(false);

oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDariahdeOnlineTests.java

@@ -29,7 +29,7 @@ import org.junit.Test;
  * 
  * @author Stefan E. Funk, SUB Göttingen
  */
-@Ignore
+// @Ignore
 public class OaiPmhDariahdeOnlineTests {
   // **
   // FINALS
@@ -58,7 +58,10 @@ public class OaiPmhDariahdeOnlineTests {
   private static String checkListRecordsDCUntil;
   private static String checkListRecordsDATACITEFrom;
   private static String checkListRecordsDATACITEUntil;
+  private static String checkListRecordsSet;
+  private static Integer checkListRecordsSetExpectedPages;
   private static String checkListIdentifiersSet;
+  private static Integer checkListIdentifiersSetExpectedPages;
   private static List<String> checkGetRecordIDList = new ArrayList<String>();
 
   // **
@@ -93,7 +96,12 @@ public class OaiPmhDariahdeOnlineTests {
         .getProperty("checkListRecordsDATACITEFrom");
     checkListRecordsDATACITEUntil = p
         .getProperty("checkListRecordsDATACITEUntil");
+    checkListRecordsSet = p.getProperty("checkListRecordsSet");
+    checkListRecordsSetExpectedPages =
+        Integer.parseInt(p.getProperty("checkListRecordsSetExpectedPages").trim());
     checkListIdentifiersSet = p.getProperty("checkListIdentifiersSet");
+    checkListIdentifiersSetExpectedPages =
+        Integer.parseInt(p.getProperty("checkListIdentifiersSetExpectedPages").trim());
     checkGetRecordIDList = OaiPmhTestUtilities
         .getListFromProperties((String) p.get("checkGetRecordIDList"));
 
@@ -243,6 +251,21 @@ public class OaiPmhDariahdeOnlineTests {
     testList("ListRecords", "oai_dc", OaiPmhTestUtilities.NO_SET);
   }
 
+  /**
+   * @throws IOException
+   */
+  @Test
+  public void testListRecordsSetDC() throws IOException {
+
+    System.out.println(OaiPmhTestUtilities.TESTING + "#LISTRECORDS");
+
+    int pages = testList("ListRecords", "oai_dc", checkListRecordsSet);
+
+    if (pages != checkListRecordsSetExpectedPages) {
+      assertTrue(pages + " != " + checkListRecordsSetExpectedPages, false);
+    }
+  }
+
   /**
    * @throws IOException
    */
@@ -325,6 +348,21 @@ public class OaiPmhDariahdeOnlineTests {
     testList("ListIdentifiers", "oai_dc", OaiPmhTestUtilities.NO_SET);
   }
 
+  /**
+   * @throws IOException
+   */
+  @Test
+  public void testListIdentifiersSetDC() throws IOException {
+
+    System.out.println(OaiPmhTestUtilities.TESTING + "#LISTIDENTIFIERS");
+
+    int pages = testList("ListIdentifiers", "oai_dc", checkListIdentifiersSet);
+
+    if (pages != checkListIdentifiersSetExpectedPages) {
+      assertTrue(pages + " != " + checkListIdentifiersSetExpectedPages, false);
+    }
+  }
+
   /**
    * @throws IOException
    */

oaipmh-core/src/test/resources/oaipmh.test.repository-de-dariah-eu.properties

@@ -14,6 +14,9 @@ checkListRecordsDCFrom =
 checkListRecordsDCUntil =
 checkListRecordsDATACITEFrom =
 checkListRecordsDATACITEUntil =
-# ListIdentifiers
+checkListRecordsSet = 
+checkListRecordsSetExpectedPages =
+ # ListIdentifiers
 checkListIdentifiersSet = 
+checkListIdentifiersSetExpectedPages = 
  
\ No newline at end of file

oaipmh-core/src/test/resources/oaipmh.test.trep-de-dariah-eu.properties

@@ -14,6 +14,9 @@ checkListRecordsDCFrom =
 checkListRecordsDCUntil =
 checkListRecordsDATACITEFrom =
 checkListRecordsDATACITEUntil =
-# ListIdentifiers
-checkListIdentifiersSet = 
+checkListRecordsSet = hdl:21.T11991/0000-001C-2AA6-8
+checkListRecordsSetExpectedPages = 4
+ # ListIdentifiers
+checkListIdentifiersSet = hdl:21.T11991/0000-001C-2AA6-8
+checkListIdentifiersSetExpectedPages = 4
  
\ No newline at end of file