diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml index 8f8d34103e3a8795d6ff41a4fe68576963977bc5..42f3896234d03ef749be38183f72bf50172b7788 100644 --- a/oaipmh-core/pom.xml +++ b/oaipmh-core/pom.xml @@ -84,7 +84,7 @@ <dependency> <groupId>org.classicmayan.tools</groupId> <artifactId>metsModsMapping</artifactId> - <version>1.0</version> + <version>1.1.4</version> </dependency> <dependency> <groupId>de.shadowhunt.maven.plugins</groupId> diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java index 3fc1607fb47a11f216458f80be0995cb075c5347..e0bc710c7abef9029e265dbfbef6931dec58e31d 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java @@ -76,8 +76,10 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract { GetResponse objectInDatabase = recordById.execute().actionGet(); + System.out.println("id in elasticsearch is: " + changedId); this.dateOfObjectCreation = objectInDatabase.getField(TGConstants.CREATED).getValue().toString(); + this.dateOfLastOblectModification = objectInDatabase.getField(TGConstants.MODIFIED_FIELD).getValue().toString(); } diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java index 8aa5dc45fa0756caadef55e63921b171be65261c..75713ab5f8127478a9e82368125467ee9adfcb00 100644 --- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java +++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java @@ -361,12 +361,13 @@ public class OaiPmhTest { String resToken = ""; for (Map.Entry<String, Integer> entry : RecordListDelivererIDIOM.cursorCollector.entrySet()) { resToken = entry.getKey(); + String p2 = this.request.getRequest("ListRecords", "", "", "", "", "", resToken); + System.out.println(p2); + System.out.println("HASH MAP AFTER: "); + System.out.println(RecordListDelivererIDIOM.cursorCollector); + System.out.println("-----------------------------------\n"); } - String p2 = this.request.getRequest("ListRecords", "", "", "", "", "", resToken); - System.out.println(p2); - System.out.println("HASH MAP AFTER: "); - System.out.println(RecordListDelivererIDIOM.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 a8ed9cfedf4047fd712eff791c0c04f91f749c68..952f88aa57dcd74b626760fc72cc7efa981d340f 100644 --- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java +++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java @@ -338,7 +338,7 @@ public class OaiPmhTextgridOnlineTests { // Do not test on dev.textgridlab.org. if (!host.contains("dev.textgridlab.org")) { - testList(VERB_LIST_RECORDS, NO_SET, OAI_IDIOMMETS_PREFIX, 3, 30, NO_THREAD_NAME); + testList(VERB_LIST_RECORDS, NO_SET, OAI_IDIOMMETS_PREFIX, 100, 30, NO_THREAD_NAME); } System.out.println(OK); @@ -699,7 +699,6 @@ public class OaiPmhTextgridOnlineTests { throws IOException { String res = IOUtils.readStringFromStream(theResponse.getInputstream()); - // Test for OAIPMH errors. if (res.contains("<error code=\"badArgument\">")) { System.err.println(theThreadName + ERROR + " IN OAIPMH RESPONSE: " + res); @@ -853,6 +852,7 @@ public class OaiPmhTextgridOnlineTests { + loopCount + (numberOfPagesToTest != 0 ? "/" + numberOfPagesToTest : "") + ")"); restok = examineResumptionTokenTag(httpResponse, testOccurance, restok, recordsExpectedPerRequest, loopCount, theThreadName); + } } diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml index 14dfb55c378b363e5b68bee9ff62c072ad40cce1..9517cb52541b7f905b04b8238a8be53dd770ee94 100644 --- a/oaipmh-webapp/pom.xml +++ b/oaipmh-webapp/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>oaipmh</artifactId> <groupId>info.textgrid.middleware</groupId> - <version>3.1.9-SNAPSHOT</version> + <version>3.1.10</version> </parent> <groupId>info.textgrid.middleware</groupId> <artifactId>oaipmh-webapp</artifactId> diff --git a/pom.xml b/pom.xml index d831e36e6a3033c4cb8d9b53ded78755d708971b..0a8fa50aad4d67e369a63e241439433b659c3b59 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>info.textgrid.middleware</groupId> <artifactId>oaipmh</artifactId> - <version>3.1.9-SNAPSHOT</version> + <version>3.1.10</version> <packaging>pom</packaging> <name>DARIAHDE :: OAI-PMH DataProvider</name> <properties>