From 206c5d5c2ba7bc7b9c05419e33e6f24aa354e4ed Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Tue, 28 May 2019 19:22:55 +0200
Subject: [PATCH] Removed some unused commented out code
---
.../IdentifierListDelivererAbstract.java | 33 -------------------
.../middleware/OaiPmhTextgridOnlineTests.java | 4 +--
2 files changed, 2 insertions(+), 35 deletions(-)
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
index 6febc634..b94d7206 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
@@ -52,25 +52,6 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
+ request.getIdentifier());
}
- // // Check if resumptioToken is valid
- // if (request.getResumptionToken() != null) {
- //
- // if (IdentifierListDelivererAbstract.isIdiomMets()
- // && IdentifierListDelivererIDIOM.cursorCollector
- // .containsKey(request.getResumptionToken())) {
- // IdentifierListDelivererAbstract.setIdiomMets(true);
- // IdentifierListDelivererAbstract.setDublinCore(false);
- // } else if (IdentifierListDelivererAbstract.isDublinCore()
- // && IdentifierListDelivererDC.cursorCollector.containsKey(request.getResumptionToken())) {
- // IdentifierListDelivererAbstract.setDublinCore(true);
- // IdentifierListDelivererAbstract.setIdiomMets(false);
- // } else {
- // result.setError(TGConstants.OAI_BAD_RESUMPTION_TOKEN,
- // "The value of the " + request.getResumptionToken()
- // + " argument is invalid or expired.");
- // }
- // }
-
// Check if resumptionToken is invalid or existing.
if (request.getResumptionToken() != null) {
boolean restokDCExisting = RecordListDelivererIDIOM.cursorCollector != null
@@ -83,20 +64,6 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
}
}
- // if (request.getResumptionToken() == null && request.getMetadataPrefix() != null) {
- // if (request.getMetadataPrefix().equals(TGConstants.METADATA_IDIOM_PREFIX)) {
- // IdentifierListDelivererAbstract.setIdiomMets(true);
- // IdentifierListDelivererAbstract.setDublinCore(false);
- // }
- // if (request.getMetadataPrefix().equals(TGConstants.METADATA_DC_PREFIX)) {
- // IdentifierListDelivererAbstract.setDublinCore(true);
- // IdentifierListDelivererAbstract.setIdiomMets(false);
- // }
- // }
- //
- // // Check if other params are existing, they shouldn't!
- // else {
-
List<String> errorValues = new ArrayList<String>();
if (request.getResumptionToken() != null && request.getMetadataPrefix() != null) {
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
index fc636837..a8ed9cfe 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
@@ -45,13 +45,13 @@ public class OaiPmhTextgridOnlineTests {
// The OAIPMH host to be tested.
// private static String host = "http://dev.textgridlab.org/1.0/tgoaipmh/";
- // private static String host = "http://textgridlab.org/1.0/tgoaipmh/";
+ private static String host = "http://textgridlab.org/1.0/tgoaipmh/";
// NOTE Test with "mvn jetty:run" in oaipmh-webapp module folder and SSH tunneling "ssh -L
// 9302:localhost:9302 -l username textgrid-esx2.gwdg.de", please use original OAIPMH config file
// from /etc/dhrep/oaipmh/oaipmh.textgrid.properties and copy it to
// /etc/dhrep/oaipmh/oaipmh.config on your local machine!
- private static String host = "http://localhost:8095/oaipmh/";
+ // private static String host = "http://localhost:8095/oaipmh/";
// NOTE Use "mvn tomcat:run" here!
// private static String host = "http://localhost:8080/oaipmh-webapp/";
--
GitLab