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 d1e9a73d9d665e0e4ca6153e841f5e01aaeb9b0c..8c761e57d4f8b48e60dec443306f81293cfff56c 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDeliverer.java @@ -109,7 +109,7 @@ public class RecordListDeliverer { private static Map<String, Integer> cursorCollector = new Hashtable<String, Integer >(); - private long searchResponseSize; + private int searchResponseSize; BigInteger valueToAdd = BigInteger.valueOf(searchResponseSize); ResumptionTokenType resTokenForResponse = new ResumptionTokenType(); @@ -187,7 +187,7 @@ public class RecordListDeliverer { .setTypes(OAI_ESClient.getEsType()) .addFields(this.fields) .setQuery(recordFilter) - .setSize((int)searchResponseSize) + .setSize(searchResponseSize) .execute() .actionGet(); @@ -275,16 +275,16 @@ public class RecordListDeliverer { System.out.println(cursorCollector); if(resumptionToken != null && cursorCollector.containsKey(resumptionToken)){ System.out.println("RESTOKEN FOUND: " + resumptionToken); - cursor = cursorCollector.get(resumptionToken).intValue() + (int)searchResponseSize; + cursor = cursorCollector.get(resumptionToken).intValue() + searchResponseSize; System.out.println("CUROSOR: " + cursor); - resTokenForResponse.setCursor(BigInteger.valueOf((long) cursor + (int)searchResponseSize)); - System.out.println("withtoken" + cursorCollector.get(resumptionToken) + (int)searchResponseSize); + resTokenForResponse.setCursor(BigInteger.valueOf((long) cursor + searchResponseSize)); + System.out.println("withtoken" + cursorCollector.get(resumptionToken) + searchResponseSize); //cursor = cursorCollector.get(resumptionToken) + (int)searchResponseSize; cursorCollector.put(scrollResp.getScrollId(), cursor); }else { System.out.println("NO RESTOKEN FOUND"); - resTokenForResponse.setCursor(BigInteger.valueOf((int)searchResponseSize)); - cursorCollector.put(scrollResp.getScrollId(), (int)searchResponseSize); + resTokenForResponse.setCursor(BigInteger.valueOf(searchResponseSize)); + cursorCollector.put(scrollResp.getScrollId(), searchResponseSize); System.out.println(cursorCollector.get(scrollResp.getScrollId())); //System.out.println("withOUTtoken" + cursorCollector.get(resumptionToken) + (int)searchResponseSize); } @@ -755,14 +755,18 @@ public class RecordListDeliverer { this.identifierField = identifierField; } - public long getSearchResponseSize() { + public int getSearchResponseSize() { return searchResponseSize; } - public void setIdentifierField(long searchResponseSize) { + public void setSearchResponseSize(int searchResponseSize) { + this.searchResponseSize = searchResponseSize; } - + + /*public void setBlubb(String test) { + System.out.println("blubb: " + test); + }*/ /* diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml index de38cd9f37330b6e9fa2cf8589b0656a1f263b58..979d384f78697d64b7fab3aeebf4a2b44558ccef 100644 --- a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml +++ b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml @@ -109,7 +109,7 @@ <property name="types" value="${typeList}" /> <property name="modifiedField" value="${modifiedField}" /> <property name="identifierField" value="${identifierField}" /> - <property name="searchResponseSize" value="searchResponseSize" /> + <property name="searchResponseSize" value="${searchResponseSize}" /> </bean> <bean id="Record" class="info.textgrid.middleware.RecordDeliverer">