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 5ef2c3bfed96a746f07ae990dfcaca04afa34f59..cd74b007fe493737bb0f09de5efdd24e37dcd931 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java @@ -97,43 +97,6 @@ public class OAIPMHUtilities { return auth.getProjectInfo(projectID).getName(); } - - public static List<String> urisFromSparqlResponse(InputStream in) { - - List<String> urilist = new ArrayList<String>(); - String theString; - try { - theString = IOUtils.toString(in, "UTF-8"); - System.out.println(theString); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - - try { - XMLStreamReader r = XMLInputFactory.newInstance() - .createXMLStreamReader(in); - while (r.hasNext()) { - if ((r.next() == XMLStreamConstants.START_ELEMENT)) { - System.out.println(r.getLocalName()); - } -/* - if ((r.next() == XMLStreamConstants.START_ELEMENT) && (r.getLocalName().equals("uri"))) { - // if (r.getLocalName().equals("uri")) { - String uri = r.getElementText(); - // log.debug("uri: " + uri); - urilist.add(uri); - // } - }*/ - } - } catch (XMLStreamException e) { - log.error("error parsing sparql-result-stream", e); - } - System.out.println("urilistSize: " + urilist.size()); - return urilist; - } - - /** * <p> * Producing the list of all metadata formats. @@ -257,9 +220,10 @@ public class OAIPMHUtilities { cursorCollector.put(scrollID, cursor); } else { resTokenForResponse.setCursor(BigInteger.valueOf(searchResponseSize)); - cursorCollector.put(scrollID, searchResponseSize); + cursorCollector.put(scrollID, searchResponseSize); cursor = 0; - System.out.println("CURSOR: " + cursor); + resTokenForResponse.setCursor(BigInteger.valueOf((long) cursor)); + } // Set resumption token string if cursor is less then complete list size: More objects can be diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java index e289c15a9f6b4fa16f7761dee2264696a9cb60b5..7b0fab41cc31ec6c4baf79e83d96964447c99019 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java @@ -48,8 +48,7 @@ public abstract class RecordListDelivererAbstract implements RecordListDeliverer boolean restokDCExisting = RecordListDelivererDC.cursorCollector != null && RecordListDelivererDC.cursorCollector.containsKey(request.getResumptionToken()); - if (!restokDCExisting && !restokIDIOMExisting) { - System.out.println("BLA"); + if (!restokDCExisting && !restokIDIOMExisting) { result.setError(TGConstants.OAI_BAD_RESUMPTION_TOKEN, "The value of the " + request.getResumptionToken() + " argument is invalid or expired."); } 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 a59f5d2e3bb68a49f58034e5e6300f892e31bbac..3604b5e1d320909cd8e8cbed14151095e477dc16 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java @@ -272,10 +272,12 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract { completeListSize, resumptionToken, cursorCollector, scrollID, this.searchResponseSize, i); System.out.println(completeListSize); System.out.println(resumptionToken); - System.out.println(cursorCollector); + //System.out.println(cursorCollector); System.out.println(scrollID); - System.out.println(this.searchResponseSize); - System.out.println(i); + //System.out.println(this.searchResponseSize); + //System.out.println(i); + + System.out.println(resTokenForResponse.getCursor()); if (resTokenForResponse != null) { recordList.setResumptionToken(resTokenForResponse);