From b5d0eac0e20cfbd6daadcd528b96b4b7b90d6f19 Mon Sep 17 00:00:00 2001 From: mbrodhu <brodhun@sub.uni-goettingen.de> Date: Fri, 18 Nov 2016 15:51:12 +0100 Subject: [PATCH] res token of hell --- .../info/textgrid/middleware/IdentifierListDeliverer.java | 6 +++--- .../java/info/textgrid/middleware/RecordListDeliverer.java | 4 ++-- .../src/test/java/info/textgrid/middleware/OaiPmhTest.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java index c38703c9..3d6a78da 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java @@ -207,11 +207,11 @@ public class IdentifierListDeliverer { cursor = 0; } - if(cursor < listFurtherValues.getHits().getTotalHits()){ + if(cursor <= listFurtherValues.getHits().getTotalHits()){ resTokenForResponse.setValue(listFurtherValues.getScrollId()); - resTokenForResponse.setCompleteListSize(BigInteger.valueOf(listFurtherValues.getHits().getTotalHits())); - lit.setResumptionToken(resTokenForResponse); } + resTokenForResponse.setCompleteListSize(BigInteger.valueOf(listFurtherValues.getHits().getTotalHits())); + lit.setResumptionToken(resTokenForResponse); return listFurtherValues; } diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java index b36195c7..1fa5fdcc 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java @@ -434,7 +434,7 @@ public class RecordListDeliverer { String identifierForHeader = ""; //System.out.println("DATESIZE: " + dates.size()); - if(dates.size() > 0){ + //if(dates.size() > 0){ try { header.setDatestamp(OAIPMHUtillities.convertDateFormat(this.modifiedValue).toXMLFormat()); } catch (ParseException e) { @@ -460,7 +460,7 @@ public class RecordListDeliverer { header.getSetSpec().add(set); // System.out.println("BLABLUBB"); // header.getSetSpec().add(this.collectionTitle); - } + //} } return header; } diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java index 67ab8e7c..594b5214 100644 --- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java +++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java @@ -366,7 +366,7 @@ public class OaiPmhTest { this.recordList.setIdentifierField("textgridUri"); this.recordList.setSearchResponseSize("100"); - JAXBElement<OAIPMHType> r = this.request.getRequest("ListRecords", "","", "", "", "", "="); + JAXBElement<OAIPMHType> r = this.request.getRequest("ListRecords", "","oai_dc", "project:TGPR-355b6bcd-668d-5f79-e661-582305346ed1", "", "", ""); JAXB.marshal(r, System.out); System.out.println("-----------------------------------\n"); } -- GitLab