From 819ced278a377ea5456be46408c80cfae66e6b61 Mon Sep 17 00:00:00 2001 From: mbrodhu <behnert-brodhun@sub.uni-goettingen.de> Date: Sun, 6 Dec 2020 20:56:44 +0100 Subject: [PATCH] correct datestamps in recorddates for metsMods in idiom --- oaipmh-core/pom.xml | 2 +- .../textgrid/middleware/RecordDelivererIDIOM.java | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml index 643eb32f..6f9dc1a6 100644 --- a/oaipmh-core/pom.xml +++ b/oaipmh-core/pom.xml @@ -85,7 +85,7 @@ <dependency> <groupId>org.classicmayan.tools</groupId> <artifactId>metsModsMapping</artifactId> - <version>1.1.11</version> + <version>1.1.13</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 781f3e2a..9cf2bddb 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java @@ -30,9 +30,9 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract { private String dateOfLastOblectModification; private OAI_ESClient oaiEsClient; - static MetadataType metadataMets = new MetadataType(); + RecordType record = new RecordType(); - ClassicMayanMetsMods metsmods; + //ClassicMayanMetsMods metsmods; private static org.apache.commons.logging.Log log = LogFactory.getLog(RecordDelivererIDIOM.class); @@ -90,7 +90,7 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract { */ public GetRecordType getRecordById(String id) { - + ClassicMayanMetsMods metsmods; GetRecordType grt = new GetRecordType(); setDatestamps(id); @@ -101,11 +101,11 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract { textgridBaseURI_FromID = id; } log.info("ID for generating the METS/MODS file is: " + textgridBaseURI_FromID); - this.metsmods = new ClassicMayanMetsMods( + metsmods = new ClassicMayanMetsMods( textgridBaseURI_FromID, this.dateOfObjectCreation, this.dateOfLastOblectModification); - this.record.setMetadata(idiomMets()); + this.record.setMetadata(idiomMets(metsmods)); try { if (!id.startsWith("textgrid:")) { setRecordHeader(this.dateOfObjectCreation, "textgrid:" + id); @@ -133,14 +133,15 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract { * @return metadata XML-Elment */ - private MetadataType idiomMets() { + private MetadataType idiomMets(ClassicMayanMetsMods metsmods) { + MetadataType metadataMets = new MetadataType(); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder builder; try { builder = factory.newDocumentBuilder(); - Document doc = builder.parse(new InputSource(new StringReader(this.metsmods.getMets()))); + Document doc = builder.parse(new InputSource(new StringReader(metsmods.getMets()))); metadataMets.setAny(doc.getDocumentElement()); } catch (Exception e) { e.printStackTrace(); -- GitLab