diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererAbs.java b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererAbs.java index b4ee3d96e130c7864d3b540a3930cd31638d6e4d..096a29cc6bdf34d0f66876fdb70a27de620ed9aa 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererAbs.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererAbs.java @@ -40,6 +40,13 @@ public abstract class MetadataFormatListDelivererAbs mft.setSchema(OAIPMHUtilities.OAIDC_SCHEMA_LOCATION); result.getMetadataFormat().add(mft); + // Add metadata format for OPEN AIRE. + MetadataFormatType mftOpenAire = new MetadataFormatType(); + mftOpenAire.setMetadataNamespace(OAIPMHUtilities.OPEN_AIRE_NAMESPACE); + mftOpenAire.setMetadataPrefix(TGConstants.METADATA_OPENAIRE_PREFIX); + mftOpenAire.setSchema(OAIPMHUtilities.OPEN_AIRE_SCHEMA_LOCATION); + result.getMetadataFormat().add(mftOpenAire); + return result; } diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererDH.java b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererDH.java index 97139997aed71637ee989f92c6d1a5911df5792d..f609e84675304ff600dc391428ad4105725b9404 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererDH.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererDH.java @@ -23,7 +23,8 @@ public class MetadataFormatListDelivererDH extends MetadataFormatListDelivererAb * String) */ public ListMetadataFormatsType setMetadataFormatList(String id) { - return setMetadataFormatList(); + // Get things from abstract class. + return super.setMetadataFormatList(); } } diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererTG.java b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererTG.java index fbb87deb0a8d694d94c2e23d0d790eb7952c0919..ad3f390bc511cf9fc65f5ae6e48e62c2a2ab97f3 100644 --- a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererTG.java +++ b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererTG.java @@ -77,14 +77,8 @@ public class MetadataFormatListDelivererTG extends MetadataFormatListDelivererAb */ public ListMetadataFormatsType setMetadataFormatList() { - ListMetadataFormatsType result = new ListMetadataFormatsType(); - - // Add default metadata format (oai_dc). - MetadataFormatType mft = new MetadataFormatType(); - mft.setMetadataPrefix(OAIPMHUtilities.OAIDC_PREFIX); - mft.setMetadataNamespace(OAIPMHUtilities.OAIDC_NAMESPACE); - mft.setSchema(OAIPMHUtilities.OAIDC_SCHEMA_LOCATION); - result.getMetadataFormat().add(mft); + // Get things from abstract class. + ListMetadataFormatsType result = super.setMetadataFormatList(); // Add metadata format for IDIOM. MetadataFormatType mftIdiomMets = new MetadataFormatType(); @@ -93,13 +87,6 @@ public class MetadataFormatListDelivererTG extends MetadataFormatListDelivererAb mftIdiomMets.setSchema(OAIPMHUtilities.METS_SCHEMA_LOCATION); result.getMetadataFormat().add(mftIdiomMets); - // Add metadata format for OPEN AIRE. - MetadataFormatType mftOpenAire = new MetadataFormatType(); - mftOpenAire.setMetadataNamespace(OAIPMHUtilities.OPEN_AIRE_NAMESPACE); - mftOpenAire.setMetadataPrefix(TGConstants.METADATA_OPENAIRE_PREFIX); - mftOpenAire.setSchema(OAIPMHUtilities.OPEN_AIRE_SCHEMA_LOCATION); - result.getMetadataFormat().add(mftOpenAire); - return result; }