diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
index b4a25e63b132fab57aebeca2312423468bbb8260..9f5744284eedba1d30dcd73bde4335afce21a69d 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
@@ -84,7 +84,6 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
searchRequest.source(searchSourceBuilder);
if (resumptionToken != null) {
-
SearchScrollRequest scrollRequest = new SearchScrollRequest(resumptionToken);
scrollRequest.scroll(TimeValue.timeValueHours(24L));
try {
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
index 714079d4745524dc95cb2c3e4186d41a0f73bed4..b34e7d339ef5c95b01b2aa53559ab3d1619d6bde 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
@@ -98,7 +98,10 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
if (resumptionToken != null) {
+<<<<<<< Updated upstream
+=======
+>>>>>>> Stashed changes
SearchScrollRequest scrollRequest = new SearchScrollRequest(resumptionToken);
scrollRequest.scroll(TimeValue.timeValueHours(24L));
try {
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDariahdeOnlineTests.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDariahdeOnlineTests.java
index 97c3f59850cc78afa8ca2d9bdd467459eda67eb9..db7f814c8a1ed0adc4a07eac76b3bbe827e66a6b 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDariahdeOnlineTests.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDariahdeOnlineTests.java
@@ -21,7 +21,7 @@ import info.textgrid.utils.httpclient.TGHttpResponse;
*
* @author Stefan E. Funk, SUB Göttingen
*/
-@Ignore
+//@Ignore
public class OaiPmhDariahdeOnlineTests {
// TODO Configure config files for all the different OAI-PMH service instances!
@@ -104,7 +104,11 @@ public class OaiPmhDariahdeOnlineTests {
*/
@Test
public void testRootWithSlash() throws IOException {
- testRootURL("oai/");
+
+ String url = "oai/";
+ String shouldContain = "DARIAH-DE Repository";
+
+ testRootURL(url, shouldContain);
}
/**
@@ -112,7 +116,11 @@ public class OaiPmhDariahdeOnlineTests {
*/
@Test
public void testRootWithoutSlash() throws IOException {
- testRootURL("oai");
+
+ String url = "oai";
+ String shouldContain = "DARIAH-DE Repository";
+
+ testRootURL(url, shouldContain);
}
/**
@@ -120,7 +128,11 @@ public class OaiPmhDariahdeOnlineTests {
*/
@Test
public void testBlubbVerb() throws IOException {
- testRootURL("oai?verb=BLUBB");
+
+ String url = "oai?verb=BLUBB";
+ String shouldContain = "Illegal OAI verb";
+
+ testRootURL(url, shouldContain);
}
/**
@@ -442,11 +454,10 @@ public class OaiPmhDariahdeOnlineTests {
/**
* @param theURL
+ * @param shouldContain
* @throws IOException
*/
- private static void testRootURL(String theURL) throws IOException {
-
- String shouldContain = "DARIAH-DE Repository";
+ private static void testRootURL(String theURL, String shouldContain) throws IOException {
System.out.println(TESTING + "#ROOTURL");
@@ -466,4 +477,3 @@ public class OaiPmhDariahdeOnlineTests {
}
}
-
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestDH.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestDH.java
index 0cb8240eb39e39acfb966e2d5e92fe5c58d6494c..073188275ca70b669ac6f7ec86105310b0143794 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestDH.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestDH.java
@@ -27,7 +27,6 @@ public class OaiPmhTestDH {
private static OpenAireRecordList openAireRecordList;
private static OpenAireIdentifierList openAireIdentifierList;
-
private DeletedRecordType deletedRecordType = DeletedRecordType.NO;
private GranularityType granularityType = GranularityType.YYYY_MM_DD_THH_MM_SS_Z;
private RepIdentification rep = new RepIdentification("DARIAH-DE Repository",
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestTG.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestTG.java
index 0726fe60430a1697a138d4daa2e6a86165e2e671..ac44d25af03bc29e90adf6aea36e8cd818a5e04b 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestTG.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestTG.java
@@ -85,7 +85,6 @@ public class OaiPmhTestTG {
* openAireIdentifierList = new OpenAireIdentifierList(true, false);
*/
-
recordList = new RecordListDelivererDC(true, false);
recordList.setFields(TGConstants.TGFields);
recordList.setWorkFields(TGConstants.TGWorkFields);
@@ -103,74 +102,83 @@ public class OaiPmhTestTG {
}
+ /**
+ *
+ */
@Test
public void testGetArrayFromESIndex() {
- String jsonAsString = "{\"administrativeMetadata\":{\"dcterms:identifier\":\"hdl:21.T11991/0000-001B-4C02-C\",\"dcterms:modified\":\"2021-06-08T11:03:37.448\"},\"descriptiveMetadata\":{\"dc:creator\":\"fu\",\"dc:format\":\"text/vnd.dariah.dhrep.collection+turtle\",\"dc:rights\":\"free\",\"dc:title\":\"First ES6 Tests for DH-rep using Publikator\",\"dc:identifier\":[\"hdl:21.T11991/0000-001B-4C02-C\",\"doi:10.20375/0000-001B-4C02-C\"]}}";
-
- JSONObject json = new JSONObject(jsonAsString);
- //System.out.println(json);
- DublinCoreBuilder result = new DublinCoreBuilder();
- List<String> identifier = new ArrayList<String>();
- String[] fieldsForIdentifier = {"descriptiveMetadata.dc:identifier"};
- System.out.println(OAIPMHUtilities.fieldLoader(json, DARIAHConstants.IDENTIFIER));
- identifier = OAIPMHUtilities.fieldLoader(json, fieldsForIdentifier);
- for(String id : identifier) {
- System.out.println(id);
- }
-
- result.setIdentifier(identifier);
+ String jsonAsString =
+ "{\"administrativeMetadata\":{\"dcterms:identifier\":\"hdl:21.T11991/0000-001B-4C02-C\",\"dcterms:modified\":\"2021-06-08T11:03:37.448\"},\"descriptiveMetadata\":{\"dc:creator\":\"fu\",\"dc:format\":\"text/vnd.dariah.dhrep.collection+turtle\",\"dc:rights\":\"free\",\"dc:title\":\"First ES6 Tests for DH-rep using Publikator\",\"dc:identifier\":[\"hdl:21.T11991/0000-001B-4C02-C\",\"doi:10.20375/0000-001B-4C02-C\"]}}";
+
+ JSONObject json = new JSONObject(jsonAsString);
+ // System.out.println(json);
+ DublinCoreBuilder result = new DublinCoreBuilder();
+ List<String> identifier = new ArrayList<String>();
+ String[] fieldsForIdentifier = {"descriptiveMetadata.dc:identifier"};
+ System.out.println(OAIPMHUtilities.fieldLoader(json, DARIAHConstants.IDENTIFIER));
+ identifier = OAIPMHUtilities.fieldLoader(json, fieldsForIdentifier);
+ for (String id : identifier) {
+ System.out.println(id);
+ }
+
+ result.setIdentifier(identifier);
}
-
-
+
+ /**
+ *
+ */
@Test
public void testGetArrayFromESIndexForListRecords() {
- String jsonAsString = "{\r\n"
- + " \"administrativeMetadata\": {\r\n"
- + " \"dcterms:created\": \"2021-06-16T17:15:48.689\",\r\n"
- + " \"dcterms:creator\": \"StefanFunk@dariah.eu\",\r\n"
- + " \"dcterms:extent\": 154064,\r\n"
- + " \"dcterms:identifier\": \"hdl:21.T11991/0000-001B-4D41-4\",\r\n"
- + " \"dcterms:modified\": \"2021-06-16T17:15:48.689\"\r\n"
- + " },\r\n"
- + " \"descriptiveMetadata\": {\r\n"
- + " \"dc:creator\": \"fu\",\r\n"
- + " \"dc:description\": \"just some ictures\",\r\n"
- + " \"dc:format\": \"image/jpeg\",\r\n"
- + " \"dc:identifier\": [\r\n"
- + " \"hdl:21.T11991/0000-001B-4D41-4\",\r\n"
- + " \"doi:10.20375/0000-001B-4D41-4\"\r\n"
- + " ],\r\n"
- + " \"dc:relation\": \"hdl:21.T11991/0000-001B-4D28-1\",\r\n"
- + " \"dc:rights\": \"free\",\r\n"
- + " \"dc:title\": \"2017-07-12-Waffel copy 2.jpeg\"\r\n"
- + " },\r\n"
- + " \"technicalMetadata\": {\r\n"
- + " \"externalIdentifier\": \"fmt/43\",\r\n"
- + " \"externalIdentifierType\": \"puid\",\r\n"
- + " \"format\": \"JPEG File Interchange Format\",\r\n"
- + " \"mimetype\": \"image/jpeg\",\r\n"
- + " \"valid\": \"true\",\r\n"
- + " \"version\": \"1.01\",\r\n"
- + " \"well-formed\": \"true\"\r\n"
- + " }\r\n"
- + " }";
-
- JSONObject json = new JSONObject(jsonAsString);
- //System.out.println(json);
- DublinCoreBuilder result = new DublinCoreBuilder();
- List<String> identifier = new ArrayList<String>();
- String[] fieldsForIdentifier = {"descriptiveMetadata.dc:identifier"};
- System.out.println(OAIPMHUtilities.fieldLoader(json, DARIAHConstants.IDENTIFIER));
- identifier = OAIPMHUtilities.fieldLoader(json, fieldsForIdentifier);
- for(String id : identifier) {
- System.out.println(id);
- }
-
- result.setIdentifier(identifier);
-
- System.out.println(result);
+ String jsonAsString = "{\r\n"
+ + " \"administrativeMetadata\": {\r\n"
+ + " \"dcterms:created\": \"2021-06-16T17:15:48.689\",\r\n"
+ + " \"dcterms:creator\": \"StefanFunk@dariah.eu\",\r\n"
+ + " \"dcterms:extent\": 154064,\r\n"
+ + " \"dcterms:identifier\": \"hdl:21.T11991/0000-001B-4D41-4\",\r\n"
+ + " \"dcterms:modified\": \"2021-06-16T17:15:48.689\"\r\n"
+ + " },\r\n"
+ + " \"descriptiveMetadata\": {\r\n"
+ + " \"dc:creator\": \"fu\",\r\n"
+ + " \"dc:description\": \"just some ictures\",\r\n"
+ + " \"dc:format\": \"image/jpeg\",\r\n"
+ + " \"dc:identifier\": [\r\n"
+ + " \"hdl:21.T11991/0000-001B-4D41-4\",\r\n"
+ + " \"doi:10.20375/0000-001B-4D41-4\"\r\n"
+ + " ],\r\n"
+ + " \"dc:relation\": \"hdl:21.T11991/0000-001B-4D28-1\",\r\n"
+ + " \"dc:rights\": \"free\",\r\n"
+ + " \"dc:title\": \"2017-07-12-Waffel copy 2.jpeg\"\r\n"
+ + " },\r\n"
+ + " \"technicalMetadata\": {\r\n"
+ + " \"externalIdentifier\": \"fmt/43\",\r\n"
+ + " \"externalIdentifierType\": \"puid\",\r\n"
+ + " \"format\": \"JPEG File Interchange Format\",\r\n"
+ + " \"mimetype\": \"image/jpeg\",\r\n"
+ + " \"valid\": \"true\",\r\n"
+ + " \"version\": \"1.01\",\r\n"
+ + " \"well-formed\": \"true\"\r\n"
+ + " }\r\n"
+ + " }";
+
+ JSONObject json = new JSONObject(jsonAsString);
+ // System.out.println(json);
+ DublinCoreBuilder result = new DublinCoreBuilder();
+ List<String> identifier = new ArrayList<String>();
+ String[] fieldsForIdentifier = {"descriptiveMetadata.dc:identifier"};
+ System.out.println(OAIPMHUtilities.fieldLoader(json, DARIAHConstants.IDENTIFIER));
+ identifier = OAIPMHUtilities.fieldLoader(json, fieldsForIdentifier);
+ for (String id : identifier) {
+ System.out.println(id);
+ }
+
+ result.setIdentifier(identifier);
+
+ System.out.println(result);
}
-
+
+ /**
+ *
+ */
@Test
@Ignore
public void testOpenAireIdentifierList() {
@@ -324,14 +332,18 @@ public class OaiPmhTestTG {
System.out.println("-----------------------------------\n");
}
+ /**
+ * @throws ParseException
+ * @throws JAXBException
+ * @throws DatatypeConfigurationException
+ * @throws IOException
+ */
@Test
@Ignore
public void testGetRequestGetRecordOpenAire()
throws ParseException, JAXBException, DatatypeConfigurationException, IOException {
System.out.println("Test for OpenAire get record");
-
-
System.out.println("-----------------------------------\n");
// OAIPMHUtilities.marshal(oar.getResource());
// System.out.println(OAIPMHImpl.getStringFromJAXBOAIElement("GetRecord",
@@ -345,7 +357,9 @@ public class OaiPmhTestTG {
System.out.println(p);
}
-
+ /**
+ * @throws IOException
+ */
@Test
@Ignore
public void testLIstRecordsOpenAire() throws IOException {
@@ -436,6 +450,9 @@ public class OaiPmhTestTG {
System.out.println("-----------------------------------\n");
}
+ /**
+ * @throws ParseException
+ */
@Test
@Ignore
public void testMissingVerbArgument() throws ParseException {
@@ -514,8 +531,6 @@ public class OaiPmhTestTG {
* System.out.println(RecordListDelivererDC.cursorCollector);
* System.out.println("-----------------------------------\n"); }
*/
-
-
}
/**
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 89829243f5ce567f765e61b29c32c7fb02f38293..3ee5412bcdc257740db49805142d58876df69775 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
@@ -46,8 +46,8 @@ public class OaiPmhTextgridOnlineTests {
private static final String VERB_LIST_SETS = "ListSets";
// 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://dev.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
@@ -127,7 +127,7 @@ public class OaiPmhTextgridOnlineTests {
System.out.println(TESTING + "testRootUrl()");
- String shouldContain = "www.textgridrep.de";
+ String shouldContain = "textgridrep.org";
TGHttpResponse httpResponse = getHttpResponse(host + "oai", NO_THREAD_NAME);
int status = httpResponse.getStatusCode();
@@ -152,7 +152,7 @@ public class OaiPmhTextgridOnlineTests {
System.out.println(TESTING + "testIdentify()");
- String shouldContain = "www.textgridrep.de";
+ String shouldContain = "textgridrep.org";
TGHttpResponse httpResponse =
getHttpResponse(host + "oai?verb=" + VERB_IDENTIFY, NO_THREAD_NAME);
@@ -207,7 +207,7 @@ public class OaiPmhTextgridOnlineTests {
System.out.println(TESTING + "testListSets()");
- // Testing for set: Digital Bibliothek.
+ // Testing for set: TextGrid Digitale Bibliothek.
String shouldContainTEXTGRIDLABORG = "project:TGPR-372fe6dc-57f2-6cd4-01b5-2c4bbefcfd3c";
String shouldContainDEFTEXTGRIDLABORG = "project:TGPR-372fe6dc-57f2-6cd4-01b5-2c4bbefcfd3c";
@@ -338,10 +338,7 @@ public class OaiPmhTextgridOnlineTests {
System.out.println(TESTING + "testListRecordsIDIOMMETSMorePages()");
- // Do not test on dev.textgridlab.org.
- if (!host.contains("dev.textgridlab.org")) {
- testList(VERB_LIST_RECORDS, NO_SET, OAI_IDIOMMETS_PREFIX, 100, 30, NO_THREAD_NAME);
- }
+ testList(VERB_LIST_RECORDS, NO_SET, OAI_IDIOMMETS_PREFIX, 100, 30, NO_THREAD_NAME);
System.out.println(OK);
}