diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml index 6377a58ffd527821ea85bd5969fe903b08022958..9f542ac2ba6ca2a33c278aff978743d96a084632 100644 --- a/oaipmh-core/pom.xml +++ b/oaipmh-core/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>oaipmh</artifactId> <groupId>info.textgrid.middleware</groupId> - <version>4.1.0-SNAPSHOT</version> + <version>4.2.2-SNAPSHOT</version> </parent> <groupId>info.textgrid.middleware</groupId> <artifactId>oaipmh-core</artifactId> diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java index 5bad39463753b1bdbaacea758fdeab4b16a71553..3b5fbbb09dfc39329e8bec96dccb389f937b3354 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IDIOMImages.java @@ -20,7 +20,7 @@ import javax.xml.transform.TransformerFactoryConfigurationError; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.classicmayan.tools.ConedaKorID; +import org.classicmayan.tools.TextGridUri; import org.classicmayan.tools.ImageMetsMods; import org.classicmayan.tools.MediaHarvester; import org.json.JSONArray; @@ -140,9 +140,11 @@ public class IDIOMImages implements RecordDelivererInterface, RecordListDelivere //ImageMetsMods imm = new ImageMetsMods(new ConedaKorID(id)); ImageMetsMods immByTGURI = null; - try { + + try { System.out.println(id); - immByTGURI = new ImageMetsMods(id, "2016-02-18T10:15:19Z", "2016-02-18T10:15:19Z"); + //TextGridUri asa = new TextGridUri(); + immByTGURI = new ImageMetsMods(new TextGridUri(id)); } catch (CrudClientException e1) { // TODO Auto-generated catch block e1.printStackTrace(); 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 62c379f300570fb24945bfc9282fdf436cc371be..493e6d949cb90c4417cf6917210d851a06299fb5 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java @@ -79,7 +79,7 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract { both = QueryBuilders.boolQuery().should(artefact).should(conedakor); - BoolQueryBuilder bla = QueryBuilders.boolQuery() + BoolQueryBuilder bla = QueryBuilders.boolQuery().must(rangeQuery) .must(test.filter(both)); recordFilteroClassicMayanARTEFACT = QueryBuilders.boolQuery() diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml index c6d5ad42ef9b19d093a4b675e8e0ec673584b9fd..0d29d1bcaaa34915fb0899ef19e1799130824492 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>4.1.0-SNAPSHOT</version> + <version>4.2.2-SNAPSHOT</version> </parent> <groupId>info.textgrid.middleware</groupId> <artifactId>oaipmh-webapp</artifactId> diff --git a/pom.xml b/pom.xml index eb5ae15db477d2c80420bd5230b9b5205a2f486e..f4e4f3071e6d7446b8f97f4430e4aefe7fa2b6e1 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>4.1.0-SNAPSHOT</version> + <version>4.2.2-SNAPSHOT</version> <packaging>pom</packaging> <name>DARIAHDE :: OAI-PMH DataProvider</name> <properties> @@ -31,7 +31,7 @@ <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version> <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version> <maven-jaxb2-plugin.version>0.14.0</maven-jaxb2-plugin.version> - <mets-mods-mapping.version>1.1.27-SNAPSHOT</mets-mods-mapping.version> + <mets-mods-mapping.version>1.1.34</mets-mods-mapping.version> <package-info-maven-plugin.version>1.4.5</package-info-maven-plugin.version> <properties-maven-plugin.version>1.0-alpha-2</properties-maven-plugin.version> <!-- <slf4j.version>1.7.5</slf4j.version> -->