From 75fc49b7c31fe35a876eeb2c18d88b28f327c7ec Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Mon, 25 Oct 2021 17:44:32 +0200
Subject: [PATCH] Add error return
---
.../src/main/java/info/textgrid/middleware/OAIPMHImpl.java | 2 ++
.../java/info/textgrid/middleware/OaiPmhTestUtilities.java | 2 +-
.../info/textgrid/middleware/OaiPmhTextgridOnlineTests.java | 4 +---
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
index 28e4e5b8..59eeeb5d 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
@@ -385,6 +385,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
e.setError(OAIPMHConstants.OAI_BAD_RESUMPTION_TOKEN, "The value of the "
+ request.getResumptionToken() + " argument is invalid or expired.");
oaipmhRoot.getError().add(e.getError());
+ return oaipmhRoot;
}
}
@@ -574,6 +575,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
e.setError(OAIPMHConstants.OAI_BAD_RESUMPTION_TOKEN, "The value of the "
+ request.getResumptionToken() + " argument is invalid or expired.");
oaipmhRoot.getError().add(e.getError());
+ return oaipmhRoot;
}
}
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestUtilities.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestUtilities.java
index 3190f45c..d53d1349 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestUtilities.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestUtilities.java
@@ -44,7 +44,7 @@ public class OaiPmhTestUtilities {
// Time to wait between the single queries using resumption tokens in milliseconds.
protected static final Long TIME = 275l;
- protected static final long OAIPMH_CLIENT_TIMEOUT = 30000;
+ protected static final long OAIPMH_CLIENT_TIMEOUT = 120000;
/**
* @param theClient
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 f72f241f..fee8ac28 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
@@ -30,7 +30,7 @@ import org.junit.Test;
*
* @author Stefan E. Funk, SUB Göttingen
*/
-@Ignore
+// @Ignore
public class OaiPmhTextgridOnlineTests {
// TODO Configure config files for all the different OAI-PMH service instances!
@@ -1471,8 +1471,6 @@ public class OaiPmhTextgridOnlineTests {
*/
private static void examineContent(String theResponseString, String theMetadataFormat) {
- System.out.println(theResponseString);
-
// Check for correct metadata content according to metadata prefix.
if (theMetadataFormat.equals(OAIDC_SCHEMA_FORMAT)
&& !theResponseString.contains("metadataPrefix=\"" + OAIDC_SCHEMA_FORMAT + "\"")
--
GitLab