From f92bba013a416c92188568a04882e09a020c5bd1 Mon Sep 17 00:00:00 2001 From: "Stefan E. Funk" <funk@sub.uni-goettingen.de> Date: Wed, 6 Jul 2022 14:38:37 +0200 Subject: [PATCH] chore: more logging --- .../info/textgrid/middleware/OAIPMHUtilities.java | 4 ---- .../textgrid/middleware/RecordListDelivererDC.java | 14 ++++++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java index e197964d..6cd0ba47 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java @@ -277,10 +277,6 @@ public class OAIPMHUtilities { // check hash map! // 2. Complete list size is > searchResponseSize and we have no token: we do need one! // 3. Complete list size is <= searchResponseSize (we do not need a token! do nothing!) - // if(searchResponseSize < 100){ - // //Just for idiom. Better implementation by config is TODO - // searchResponseSize = 30; - // } if (completeListSize > searchResponseSize) { ResumptionTokenType resTokenForResponse = new ResumptionTokenType(); diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java index 8d8cc9d3..71b6f45d 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java @@ -7,7 +7,6 @@ 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; @@ -263,16 +262,22 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract { System.out.println(" ## completeListSize: " + completeListSize); System.out.println(" ## resumptionToken: " + resumptionToken); System.out.println(" ## scrollid: " + scrollID); + System.out.println(" ## searchResponseSize: " + this.searchResponseSize); ResumptionTokenType resTokenForResponse = OAIPMHUtilities.getResumptionToken(completeListSize, resumptionToken, cursorCollector, scrollID, this.searchResponseSize, i); - if (resTokenForResponse != null) { - recordList.setResumptionToken(resTokenForResponse); + if (resTokenForResponse != null) { System.out.println(" ## resTokenForResponse: " + resTokenForResponse.getValue()); } - } else { + recordList.setResumptionToken(resTokenForResponse); + + // } + + } else + + { setFoundItems(false); } } @@ -283,6 +288,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract { * @see info.textgrid.middleware.RecordListDelivererInterface#getRecords(java.lang.String, * java.lang.String, java.lang.String, java.lang.String) */ + @Override public ListRecordsType getRecords(String from, String to, String set, String resumptionToken) throws ParseException, IOException { -- GitLab