From f8dddc5107cec2db126cee8364d59e29d67590e5 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Mon, 19 Jul 2021 15:58:47 +0200
Subject: [PATCH] Fix props
---
.../textgrid/middleware/OAIPMHUtilities.java | 3 --
.../textgrid/middleware/OpenAireRecord.java | 2 +-
.../middleware/RecordDelivererDATACITE.java | 28 ++++++++++++++-----
.../webapp/WEB-INF/oaipmh.dariah.properties | 4 +--
4 files changed, 24 insertions(+), 13 deletions(-)
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 e3f822b0..952dab03 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
@@ -236,9 +236,6 @@ public class OAIPMHUtilities {
public static String datestampAsString(String originalDateTimeString) throws ParseException {
SimpleDateFormat tgItemTime = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.S");
-
- System.out.println("DATE? " + originalDateTimeString);
-
Date date = tgItemTime.parse(originalDateTimeString);
SimpleDateFormat outFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
outFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OpenAireRecord.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OpenAireRecord.java
index 4b3e9308..ed6d910a 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OpenAireRecord.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OpenAireRecord.java
@@ -494,7 +494,7 @@ public class OpenAireRecord extends RecordDelivererAbstract {
for (String dateField : this.dateFields) {
Date dateInOpenAireRecord = new Date();
- System.out.println(" ## date field: " + dateField);
+ log.debug("date field: " + dateField);
try {
dateInOpenAireRecord.setValue(OAIPMHUtilities
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDATACITE.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDATACITE.java
index d8fc2afe..57b8d513 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDATACITE.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDATACITE.java
@@ -771,13 +771,27 @@ public class RecordDelivererDATACITE extends RecordDelivererAbstract {
Identifier identifier = new Identifier();
String idValue = OAIPMHUtilities.fieldLoader(this.jsonObj, this.oarIdentifierField);
- // We must set Handle here for TG, cause we do not have a DOI! So this maybe will be not valid
- // due to Datacite schema validation!
- // We set Handle for DH, too, because we do not have the DOI in administrativeMetadata (yet),
- // seems to be related to the XSD that's creating the ES metadata in esutils!
- // TODO Please check some time!
- identifier.setIdentifierType("Handle");
- identifier.setValue(idValue);
+ // **
+ // TextGrid
+ // **
+
+ if (this.textgrid) {
+ // We must set Handle here for TG, cause we do not have a DOI! So this is not valid due to
+ // Datacite schema validation!
+ // TODO Please check some time!
+ identifier.setIdentifierType("Handle");
+ identifier.setValue(idValue);
+ }
+
+ // **
+ // DARIAH
+ // **
+
+ else if (this.dariah) {
+ // We set DOI for DH, 'cause we HAVE it! :-D
+ identifier.setIdentifierType("DOI");
+ identifier.setValue(idValue);
+ }
return identifier;
}
diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.dariah.properties b/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.dariah.properties
index f9d99173..c882c169 100644
--- a/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.dariah.properties
+++ b/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.dariah.properties
@@ -43,14 +43,14 @@ metadataFormatListInstance = MetadataFormatListDelivererDH
## Field Settings ##
######################
-fields = administrativeMetadata.dcterms:modified, administrativeMetadata.dcterms:created, administrativeMetadata.dcterms:identifier, administrativeMetadata.dcterms:extent, administrativeMetadata.dcterms:relation, administrativeMetadata.dcterms:format, descriptiveMetadata.dc:contributor, descriptiveMetadata.dc:coverage, descriptiveMetadata.dc:creator, descriptiveMetadata.dc:date, descriptiveMetadata.dc:description, descriptiveMetadata.dc:format, descriptiveMetadata.dc:identifier, descriptiveMetadata.dc:language, descriptiveMetadata.dc:publisher, descriptiveMetadata.dc:relation, descriptiveMetadata.dc:rights, descriptiveMetadata.dc:source, descriptiveMetadata.dc:subject, descriptiveMetadata.dc:title, descriptiveMetadata.dc:type, descriptiveMetadata.dc:relation
+fields = administrativeMetadata.datacite:identifier, administrativeMetadata.dcterms:modified, administrativeMetadata.dcterms:created, administrativeMetadata.dcterms:identifier, administrativeMetadata.dcterms:extent, administrativeMetadata.dcterms:relation, administrativeMetadata.dcterms:format, descriptiveMetadata.dc:contributor, descriptiveMetadata.dc:coverage, descriptiveMetadata.dc:creator, descriptiveMetadata.dc:date, descriptiveMetadata.dc:description, descriptiveMetadata.dc:format, descriptiveMetadata.dc:identifier, descriptiveMetadata.dc:language, descriptiveMetadata.dc:publisher, descriptiveMetadata.dc:relation, descriptiveMetadata.dc:rights, descriptiveMetadata.dc:source, descriptiveMetadata.dc:subject, descriptiveMetadata.dc:title, descriptiveMetadata.dc:type, descriptiveMetadata.dc:relation
workFields = descriptiveMetadata.dc:title
######################
## OpenAireRecords ###
######################
-oar.identifierField = administrativeMetadata.dcterms:identifier
+oar.identifierField = administrativeMetadata.datacite:identifier
oar.titleFields = descriptiveMetadata.dc:title
oar.dateFields = administrativeMetadata.dcterms:created, administrativeMetadata.dcterms:modified
oar.contributorFields = descriptiveMetadata.dc:contributor
--
GitLab