diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java index d5b7b2d9df6cc87f8f1de486e60ab5e4e3d35e30..2419b382acf8c3206c235067ad639f1fe4298122 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java @@ -82,7 +82,7 @@ public class OAIPMHUtilities { public static final String IDIOM_IMAGE_NAMESPACE = "http://www.loc.gov/METS/"; public static final String IDIOM_IMAGE_SCHEMA_LOCATION = - "http://www.loc.gov/standards/mets/mets.xsd"; + "http://www.loc.gov/standards/mets/mets.xsd"; public static final String DATACITE_PREFIX = "datacite"; public static final String DATACITE_NAMESPACE = "http://datacite.org/schema/kernel-3"; @@ -287,7 +287,7 @@ public class OAIPMHUtilities { ResumptionTokenType resTokenForResponse = new ResumptionTokenType(); if (resumptionToken != null && cursorCollector.containsKey(resumptionToken)) { - + cursor = cursorCollector.get(resumptionToken).intValue() + i; if (cursor == searchResponseSize) { // TODO Why not "cursor += searchResponseSize;" ?? @@ -605,16 +605,21 @@ public class OAIPMHUtilities { final String identifier, final String setSpec) { HeaderType result = new HeaderType(); - //identifier.substring(0, identifier.indexOf(".")); - if(identifier.contains(".")){ + + log.info("Header identifier: " + identifier); + + // identifier.substring(0, identifier.indexOf(".")); + if (identifier.contains(".")) { result.setIdentifier(identifier.substring(0, identifier.indexOf("."))); - }else{ + } else { result.setIdentifier(identifier); } - + + log.info("Header identifier: " + identifier); + result.setDatestamp(dateOfCreation); - log.debug( + log.info( "Header (DoC / ID / setSpec): " + dateOfCreation + " / " + identifier + " / " + setSpec); if (setSpec != null && !setSpec.isEmpty()) { diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java index 8b4fe75f878c4eb01f1c732a7c42ed45328a58a2..9c59011fbb1be72e093b358a6e4525561e8cbdb8 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java @@ -236,9 +236,6 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract { // Get identifier and setSpec field, add setSpec prefix if not already set. String identifier = OAIPMHUtilities.fieldLoader(json, this.identifierField); - - System.out.println("id=" + identifier); - String setSpec = OAIPMHUtilities.getSetSpec(set, this.specFieldPrefix, identifier); try { diff --git a/pom.xml b/pom.xml index 81850ae86a402423b81c46defa5f566e2ee03f1f..7aeb74ecd18ae7e92e069f9e48b119273a2881bc 100644 --- a/pom.xml +++ b/pom.xml @@ -10,28 +10,27 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <cxf.version>3.3.11</cxf.version> - <jdk.version>1.8</jdk.version> - <antlr-maven-plugin.version>3.2</antlr-maven-plugin.version> - <antlr-runtime.version>3.2</antlr-runtime.version> - <common.version>4.2.0-SNAPSHOT</common.version> - <cxf.version>3.3.12</cxf.version> - <elasticsearch.version>6.5.4</elasticsearch.version> - <jaxb2-namespace-prefix.version>1.3</jaxb2-namespace-prefix.version> - <jetty-maven-plugin.version>9.4.12.v20180830</jetty-maven-plugin.version> - <junit.version>4.13.1</junit.version> - <json.version>20190722</json.version> - <maven-antrun-plugin.version>1.3</maven-antrun-plugin.version> - <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> - <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.39</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> --> - <rdf4j-repository-api.version>3.0.2</rdf4j-repository-api.version> - <spring.version>4.0.2.RELEASE</spring.version> - <xstream.version>1.4.18</xstream.version> + <jdk.version>1.8</jdk.version> + <antlr-maven-plugin.version>3.2</antlr-maven-plugin.version> + <antlr-runtime.version>3.2</antlr-runtime.version> + <common.version>4.2.0-SNAPSHOT</common.version> + <cxf.version>3.3.12</cxf.version> + <elasticsearch.version>6.5.4</elasticsearch.version> + <jaxb2-namespace-prefix.version>1.3</jaxb2-namespace-prefix.version> + <jetty-maven-plugin.version>9.4.12.v20180830</jetty-maven-plugin.version> + <junit.version>4.13.1</junit.version> + <json.version>20190722</json.version> + <maven-antrun-plugin.version>1.3</maven-antrun-plugin.version> + <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version> + <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.39</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> + <rdf4j-repository-api.version>3.0.2</rdf4j-repository-api.version> + <spring.version>4.0.2.RELEASE</spring.version> + <xstream.version>1.4.18</xstream.version> </properties> <url>https://gitlab.gwdg.de/dariah-de/dariah-de-oai-pmh-services</url> <scm>