From cdf7289816ae63157902086ca691168afb5416f6 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Wed, 30 Oct 2019 18:35:05 +0100
Subject: [PATCH] Moved OAI_DC prefix to OAIPMHUtilities class Adaptive changes
---
.../textgrid/middleware/DARIAHConstants.java | 52 +++++------
.../IdentifierListDelivererAbstract.java | 2 +-
.../MetadataFormatListDeliverer.java | 4 +-
.../info/textgrid/middleware/OAIPMHImpl.java | 4 +-
.../textgrid/middleware/OAIPMHUtilities.java | 1 +
.../middleware/RecordDelivererAbstract.java | 2 +-
.../RecordListDelivererAbstract.java | 2 +-
.../info/textgrid/middleware/TGConstants.java | 87 +++++++------------
8 files changed, 61 insertions(+), 93 deletions(-)
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/DARIAHConstants.java b/oaipmh-core/src/main/java/info/textgrid/middleware/DARIAHConstants.java
index 35fd6de9..b3d49380 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/DARIAHConstants.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/DARIAHConstants.java
@@ -4,15 +4,20 @@ import java.util.Arrays;
import java.util.List;
/**
- * Collection of values never changing its content
+ * <p>
+ * Collection of values never changing its content.
+ * </p>
*
- * @author Maximilian Brodhun: SUB
+ * @author Maximilian Brodhun, SUB Göttingen
*/
public final class DARIAHConstants {
+ /**
+ *
+ */
private DARIAHConstants() {
- // not called
+ //
}
public static final String ITEM_IDENTIFIER_PREFIX = "hdl:";
@@ -21,48 +26,33 @@ public final class DARIAHConstants {
public static final List<String> TEXTGRID_REP_ADMIN_CONTACT =
Arrays.asList("support@de.dariah.eu");
- /*
- * Rep Identification String Constants
- */
-
+ // Rep Identification String Constants
public static final String DARIAH_REP_BASEURL = "repository.de.dariah.eu";
public static final String METADATA_DC_PREFIX = "rdf:RDF/rdf:Description";
- /*
- * Error String Constants
- */
-
+ // Error String Constants
public static final String OAI_BAD_ARGUMENT = "BadArgument";
public static final String OAI_METADATA_FORMAT_ERROR = "FormatError";
public static final String OAI_NO_RECORD_MATCH = "RecordMatchError";
public static final String OAI_NO_SET_HIERARCHY = "SetHierarchyError";
- /*
- * TextGrid Metadata Fields for OAI-PMH Request (Mapping to DC)
- */
-
+ // TextGrid Metadata Fields for OAI-PMH Request (Mapping to DC)
public static final String CREATED = "descriptiveMetadata.dc:date";
public static final String FORMAT = "descriptiveMetadata.dc:format";
public static final String IDENTIFIER = "administrativeMetadata.dcterms:identifier";
public static final String DATA_CONTRIBUTOR = "descriptiveMetadata.dc:contributor";
-
- public static final String[] DARIAHFields = {
- "descriptiveMetadata.dc:contributor", "descriptiveMetadata.dc:coverage",
- "administrativeMetadata.dcterms:created", "administrativeMetadata.dcterms:modified",
- "descriptiveMetadata.dc:description", "descriptiveMetadata.dc:format",
- "descriptiveMetadata.dc:identifier", "descriptiveMetadata.dc:language",
- "descriptiveMetadata.dc:publisher", "descriptiveMetadata.dc:relation",
- "descriptiveMetadata.dc:rights", "descriptiveMetadata.:source",
- "descriptiveMetadata.dc:subject",
- "descriptiveMetadata.dc:title", "descriptiveMetadata.dc:type",
- "administrativeMetadata.dcterms:identifier"};
-
+ public static final String[] DARIAHFields =
+ {"descriptiveMetadata.dc:contributor", "descriptiveMetadata.dc:coverage",
+ "administrativeMetadata.dcterms:created", "administrativeMetadata.dcterms:modified",
+ "descriptiveMetadata.dc:description", "descriptiveMetadata.dc:format",
+ "descriptiveMetadata.dc:identifier", "descriptiveMetadata.dc:language",
+ "descriptiveMetadata.dc:publisher", "descriptiveMetadata.dc:relation",
+ "descriptiveMetadata.dc:rights", "descriptiveMetadata.:source",
+ "descriptiveMetadata.dc:subject", "descriptiveMetadata.dc:title",
+ "descriptiveMetadata.dc:type", "administrativeMetadata.dcterms:identifier"};
public static final String[] DARIAHCollectionFields = {"metadata.dc:title"};
- /*
- * String Arrays to define which TextGrid fields belongs to the regarding DC fields
- */
-
+ // String Arrays to define which TextGrid fields belongs to the regarding DC fields
public static final String[] CONTRIBUTOR_LIST = {"descriptiveMetadata.dc:contributor"};
public static final String[] COVERAGE_LIST = {"descriptiveMetadata.dc:coverage"};
public static final String[] CREATOR_LIST = {"descriptiveMetadata.dc:cretor"};
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
index 92a2db90..803fda50 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
@@ -45,7 +45,7 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
// Check if metadata prefix is existing and valid.
if (request.getMetadataPrefix() != null
- && !request.getMetadataPrefix().equals(TGConstants.METADATA_DC_PREFIX)
+ && !request.getMetadataPrefix().equals(OAIPMHUtilities.OAIDC_PREFIX)
&& !request.getMetadataPrefix().equals(TGConstants.METADATA_IDIOM_PREFIX)) {
result.setError(TGConstants.OAI_METADATA_FORMAT_ERROR,
"The value of the metadataPrefix: " + request.getMetadataPrefix()
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java
index e863d9bb..10e81499 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java
@@ -55,7 +55,7 @@ public class MetadataFormatListDeliverer {
if (tgObject.isExists()) {
setIdExist(true);
- mft.setMetadataPrefix(TGConstants.METADATA_DC_PREFIX);
+ mft.setMetadataPrefix(OAIPMHUtilities.OAIDC_PREFIX);
mft.setMetadataNamespace(OAIPMHUtilities.OAIDC_NAMESPACE);
mft.setSchema(OAIPMHUtilities.OAIDC_SCHEMA_LOCATION);
lmft.getMetadataFormat().add(mft);
@@ -76,7 +76,7 @@ public class MetadataFormatListDeliverer {
MetadataFormatType mft = new MetadataFormatType();
MetadataFormatType mftIdiomMets = new MetadataFormatType();
- mft.setMetadataPrefix(TGConstants.METADATA_DC_PREFIX);
+ mft.setMetadataPrefix(OAIPMHUtilities.OAIDC_PREFIX);
mft.setMetadataNamespace(OAIPMHUtilities.OAIDC_NAMESPACE);
mft.setSchema(OAIPMHUtilities.OAIDC_SCHEMA_LOCATION);
lmft.getMetadataFormat().add(mft);
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
index 99762a56..8ffb5fb0 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
@@ -276,7 +276,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
// If metadataFormat IS SET, set recordListDeliverer accordingly.
IdentifierListDelivererInterface idListDeliv = null;
if (request.getMetadataPrefix() != null) {
- if (request.getMetadataPrefix().equals(TGConstants.METADATA_DC_PREFIX)) {
+ if (request.getMetadataPrefix().equals(OAIPMHUtilities.OAIDC_PREFIX)) {
idListDeliv = this.identifierListDC;
} else {
idListDeliv = this.identifierListIDIOM;
@@ -416,7 +416,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
// If metadataFormat IS SET, set recordListDeliverer accordingly.
RecordListDelivererInterface recListDeliv = null;
if (request.getMetadataPrefix() != null) {
- if (request.getMetadataPrefix().equals(TGConstants.METADATA_DC_PREFIX)) {
+ if (request.getMetadataPrefix().equals(OAIPMHUtilities.OAIDC_PREFIX)) {
recListDeliv = this.recordListDC;
} else {
recListDeliv = this.recordListIDIOM;
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 1457e893..9f1b13f8 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
@@ -34,6 +34,7 @@ public class OAIPMHUtilities {
public static final String OAIPMH_NAMESPACE = "http://www.openarchives.org/OAI/2.0/";
public static final String OAIPMH_SCHEMA_LOCATION =
"http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd";
+ public static final String OAIDC_PREFIX = "oai_dc";
public static final String OAIDC_NAMESPACE = "http://www.openarchives.org/OAI/2.0/oai_dc/";
public static final String OAIDC_SCHEMA_LOCATION =
"http://www.openarchives.org/OAI/2.0/oai_dc.xsd";
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
index c5af2071..59a922cc 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
@@ -39,7 +39,7 @@ public abstract class RecordDelivererAbstract implements RecordDelivererInterfac
// Check if metadata prefix is existing and valid.
if (request.getMetadataPrefix() != null
- && !request.getMetadataPrefix().equals(TGConstants.METADATA_DC_PREFIX)
+ && !request.getMetadataPrefix().equals(OAIPMHUtilities.OAIDC_PREFIX)
&& !request.getMetadataPrefix().equals(TGConstants.METADATA_IDIOM_PREFIX)) {
result.setError(TGConstants.OAI_METADATA_FORMAT_ERROR,
"The value of the metadataPrefix: " + request.getMetadataPrefix()
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
index 39b5fbc4..1d2587e3 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
@@ -31,7 +31,7 @@ public abstract class RecordListDelivererAbstract implements RecordListDeliverer
// Check if metadata prefix is existing and valid.
if (request.getMetadataPrefix() != null
- && !request.getMetadataPrefix().equals(TGConstants.METADATA_DC_PREFIX)
+ && !request.getMetadataPrefix().equals(OAIPMHUtilities.OAIDC_PREFIX)
&& !request.getMetadataPrefix().equals(TGConstants.METADATA_IDIOM_PREFIX)) {
result.setError(TGConstants.OAI_METADATA_FORMAT_ERROR,
"The value of the metadataPrefix: " + request.getMetadataPrefix()
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/TGConstants.java b/oaipmh-core/src/main/java/info/textgrid/middleware/TGConstants.java
index 50a57cf9..e28594a5 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/TGConstants.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/TGConstants.java
@@ -4,45 +4,38 @@ import java.util.Arrays;
import java.util.List;
/**
- * Collection of values never changing its content
+ * <p>
+ * Collection of values never changing its content.
+ * </p>
*
- * @author Maximilian Brodhun: SUB
+ * @author Maximilian Brodhun, SUB Göttingen
*/
public final class TGConstants {
+ /**
+ *
+ */
private TGConstants() {
- // not called
+ //
}
- // public static boolean furtherElements = true;
-
public static final String ITEM_IDENTIFIER_PREFIX = "textgrid:";
public static final List<String> TEXTGRID_REP_ADMIN_CONTACT =
- Arrays.asList("textgrid-support@gwdg.de");
+ Arrays.asList("support@de.dariah.eu");
- /*
- * Repository Identification String Constants
- */
-
- public static final String TG_REP_BASEURL = "www.textgridrep.de";
- public static final String METADATA_DC_PREFIX = "oai_dc";
+ // Repository Identification String Constants
+ public static final String TG_REP_BASEURL = "textgridrep.org";
public static final String METADATA_IDIOM_PREFIX = "oai_idiom_mets";
- /*
- * Error String Constants
- */
-
+ // Error String Constants
public static final String OAI_BAD_ARGUMENT = "BadArgument";
public static final String OAI_METADATA_FORMAT_ERROR = "FormatError";
public static final String OAI_NO_RECORD_MATCH = "RecordMatchError";
public static final String OAI_NO_SET_HIERARCHY = "SetHierarchyError";
public static final String OAI_BAD_RESUMPTION_TOKEN = "badResumptionToken";
- /*
- * TextGrid Metadata Fields for OAI-PMH Request (Mapping to DC)
- */
-
+ // TextGrid Metadata Fields for OAI-PMH Request (Mapping to DC)
public static final String CREATED = "created";
public static final String FORMAT = "format";
public static final String IDENTIFIER = "identifier";
@@ -78,27 +71,18 @@ public final class TGConstants {
public static final String WORK_AGENT = "work.agent.value";
public static final String WORK_ID = "work.subject.id.value";
public static final String MODIFIED_FIELD = "lastModified";
-
- public static final String[] TGFields = {
- CREATED, FORMAT, IDENTIFIER, DATA_CONTRIBUTOR, URI, PROJECT_ID,
- IS_DERIVED_FROM, TITLE, PID, EDITION_ISEDITIONOF, EDITION_AGENT,
- EDITION_LICENSEURI, EDITION_LANGUAGE, BIBCIT_AUTHOR, BIBCIT_EDITOR,
- BIBCIT_TITLE, BIBCIT_PLACEPUB, BIBCIT_PUBLISHER, BIBCIT_NO,
- BIBCIT_SERIES, BIBCIT_VOLUME, BIBCIT_ISSUE, BIBCIT_EPAGE,
- BIBCIT_SPAGE, BIBCIT_BIBID, WORK_ABSTRACT, WORK_GENRE, WORK_TYPE,
- WORK_SPATIAL, WORK_TEMPORAL, WORK_AGENT, MODIFIED_FIELD};
-
- public static final String[] TGWorkFields = {
- CREATED, WORK_ABSTRACT, IS_DERIVED_FROM, URI, WORK_GENRE, TITLE,
- WORK_TYPE, WORK_SPATIAL, WORK_TEMPORAL, WORK_AGENT, WORK_ID};
-
- /*
- * String Arrays to define which TextGrid fields belongs to the regarding DC fields
- */
-
+ public static final String[] TGFields =
+ {CREATED, FORMAT, IDENTIFIER, DATA_CONTRIBUTOR, URI, PROJECT_ID, IS_DERIVED_FROM, TITLE, PID,
+ EDITION_ISEDITIONOF, EDITION_AGENT, EDITION_LICENSEURI, EDITION_LANGUAGE, BIBCIT_AUTHOR,
+ BIBCIT_EDITOR, BIBCIT_TITLE, BIBCIT_PLACEPUB, BIBCIT_PUBLISHER, BIBCIT_NO, BIBCIT_SERIES,
+ BIBCIT_VOLUME, BIBCIT_ISSUE, BIBCIT_EPAGE, BIBCIT_SPAGE, BIBCIT_BIBID, WORK_ABSTRACT,
+ WORK_GENRE, WORK_TYPE, WORK_SPATIAL, WORK_TEMPORAL, WORK_AGENT, MODIFIED_FIELD};
+ public static final String[] TGWorkFields = {CREATED, WORK_ABSTRACT, IS_DERIVED_FROM, URI,
+ WORK_GENRE, TITLE, WORK_TYPE, WORK_SPATIAL, WORK_TEMPORAL, WORK_AGENT, WORK_ID};
+
+ // String Arrays to define which TextGrid fields belongs to the regarding DC fields
public static final String[] CONTRIBUTOR_LIST = {DATA_CONTRIBUTOR};
- public static final String[] COVERAGE_LIST = {
- WORK_SPATIAL, WORK_TEMPORAL};
+ public static final String[] COVERAGE_LIST = {WORK_SPATIAL, WORK_TEMPORAL};
public static final String[] CREATOR_LIST = {WORK_AGENT};
public static final String[] DATE_LIST = {CREATED};
public static final String[] DESCRIPTION_LIST = {WORK_ABSTRACT};
@@ -106,23 +90,16 @@ public final class TGConstants {
public static final String[] IDENTIFIER_LIST = {URI, PID, IDENTIFIER};
public static final String[] LANGUAGE_LIST = {EDITION_LANGUAGE};
public static final String[] PUBLISHER_LIST = {BIBCIT_PUBLISHER};
- public static final String[] RELATIONS_LIST = {
- PROJECT_ID, IS_DERIVED_FROM};
- public static final String[] RELATIONS_FOR_WORK_LIST = {
- IS_DERIVED_FROM, TITLE, URI};
+ public static final String[] RELATIONS_LIST = {PROJECT_ID, IS_DERIVED_FROM};
+ public static final String[] RELATIONS_FOR_WORK_LIST = {IS_DERIVED_FROM, TITLE, URI};
public static final String[] RIGHTS_LIST = {EDITION_LICENSEURI};
- public static final String[] SOURCE_LIST = {
- BIBCIT_AUTHOR, BIBCIT_EDITOR, BIBCIT_TITLE, BIBCIT_PLACEPUB,
- BIBCIT_PUBLISHER, BIBCIT_NO, BIBCIT_SERIES, BIBCIT_VOLUME,
- BIBCIT_ISSUE, BIBCIT_SPAGE, BIBCIT_EPAGE};
-
+ public static final String[] SOURCE_LIST =
+ {BIBCIT_AUTHOR, BIBCIT_EDITOR, BIBCIT_TITLE, BIBCIT_PLACEPUB, BIBCIT_PUBLISHER, BIBCIT_NO,
+ BIBCIT_SERIES, BIBCIT_VOLUME, BIBCIT_ISSUE, BIBCIT_SPAGE, BIBCIT_EPAGE};
public static final String[] SUBJECT_LIST = {WORK_ID};
public static final String[] TITLE_LIST = {TITLE};
-
- public static final String[] TYPE_LIST = {
- WORK_GENRE, WORK_TYPE};
-
- public static final String[] IDENTIFIER_LIST_FIELDS = {URI,
- CREATED, FORMAT};
+ public static final String[] TYPE_LIST = {WORK_GENRE, WORK_TYPE};
+ public static final String[] IDENTIFIER_LIST_FIELDS = {URI, CREATED, FORMAT};
public static final String RANGE_FIELD = CREATED;
+
}
--
GitLab