From f73bf6fa50975917103e9122ec98ef5225c1cdb3 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Wed, 7 Sep 2022 18:24:22 +0200
Subject: [PATCH] fix: remove more idiom image metadata format things
---
.../IdentifierListDelivererAbstract.java | 3 +-
.../MetadataFormatListDelivererTG.java | 1 -
.../info/textgrid/middleware/OAIPMHImpl.java | 21 +---------
.../middleware/RecordDelivererAbstract.java | 6 +--
.../RecordListDelivererAbstract.java | 5 +--
.../textgrid/middleware/OaiPmhTestTG.java | 42 -------------------
6 files changed, 6 insertions(+), 72 deletions(-)
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 3fccb4be..fc210f4f 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
@@ -93,8 +93,7 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
if (request.getMetadataPrefix() != null
&& !request.getMetadataPrefix().equals(OAIPMHUtilities.OAIDC_PREFIX)
&& !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_IDIOM_PREFIX)
- && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)
- && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_IDIOM_IMAGE_PREFIX)) {
+ && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)) {
result.setError(OAIPMHConstants.OAI_METADATA_FORMAT_ERROR,
"The value of the metadataPrefix " + request.getMetadataPrefix()
+ " is not supported by the item identified by the value of: "
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 e813bc7a..4ccb0ea2 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererTG.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererTG.java
@@ -84,7 +84,6 @@ public class MetadataFormatListDelivererTG extends MetadataFormatListDelivererAb
mftIdiomMets.setSchema(OAIPMHUtilities.METS_SCHEMA_LOCATION);
MetadataFormatType idiomImages = new MetadataFormatType();
- idiomImages.setMetadataPrefix(OAIPMHConstants.METADATA_IDIOM_IMAGE_PREFIX);
idiomImages.setMetadataNamespace(OAIPMHUtilities.IDIOM_IMAGE_NAMESPACE);
idiomImages.setSchema(OAIPMHUtilities.IDIOM_IMAGE_SCHEMA_LOCATION);
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 7c374110..bd9c1685 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
@@ -12,7 +12,6 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.XMLGregorianCalendar;
-
import info.textgrid.middleware.oaipmh.GetRecordType;
import info.textgrid.middleware.oaipmh.IdentifyType;
import info.textgrid.middleware.oaipmh.ListIdentifiersType;
@@ -32,7 +31,7 @@ import info.textgrid.middleware.oaipmh.VerbType;
*
* @author Maximilian Brodhun, SUB Göttingen
* @author Stefan E. Funk, SUB Göttingen
- * @version 2021-10-27
+ * @version 2022-09-07
* @since 2014-01-29
*/
public class OAIPMHImpl implements OAIPMHProducer {
@@ -79,8 +78,6 @@ public class OAIPMHImpl implements OAIPMHProducer {
private MetadataFormatListDelivererInterface metadataFormatList;
private SetListDeliverer setList;
- private IDIOMImages imageList = new IDIOMImages();
-
// **
// PUBLIC
// **
@@ -134,7 +131,6 @@ public class OAIPMHImpl implements OAIPMHProducer {
this.metadataFormatList = metadataFormatList;
this.setList = setList;
- this.imageList = imageList;
}
/*
@@ -303,9 +299,6 @@ public class OAIPMHImpl implements OAIPMHProducer {
if (request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)) {
recDeliv = this.recordDATACITE;
}
- if (request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_IDIOM_IMAGE_PREFIX)) {
- recDeliv = new IDIOMImages();
- }
// Finally start the QUERY!
GetRecordType getRecord = new GetRecordType();
@@ -361,12 +354,6 @@ public class OAIPMHImpl implements OAIPMHProducer {
idListDeliv = this.identifierListIDIOM;
} else if (request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)) {
idListDeliv = this.identifierListDATACITE;
- } else if (request.getMetadataPrefix()
- .equals(OAIPMHConstants.METADATA_IDIOM_IMAGE_PREFIX)) {
- imm.setKindID("1");
- imm.setPageNumber("1");
- imm.setPerPage("100");
- idListDeliv = imm;
}
}
@@ -564,12 +551,6 @@ public class OAIPMHImpl implements OAIPMHProducer {
if (request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)) {
recListDeliv = this.recordListDATACITE;
}
- if (request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_IDIOM_IMAGE_PREFIX)) {
- imm.setKindID("1");
- imm.setPageNumber("1");
- imm.setPerPage("100");
- recListDeliv = imm;
- }
}
// If metadata prefix is NOT set, check resumption token hash maps to decide which metadata
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 ccbb20ca..1fbfba35 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
@@ -7,10 +7,9 @@ import info.textgrid.middleware.oaipmh.RequestType;
/**
* @author Maximilian Brodhun, SUB Göttingen
* @author Stefan E. Funk, SUB Göttingen
- * @version 2022-08-29
+ * @version 2022-09-07
* @since 2019-03-07
*/
-
public abstract class RecordDelivererAbstract implements RecordDelivererInterface {
protected boolean textgrid;
@@ -71,8 +70,7 @@ public abstract class RecordDelivererAbstract implements RecordDelivererInterfac
if (request.getMetadataPrefix() != null
&& !request.getMetadataPrefix().equals(OAIPMHUtilities.OAIDC_PREFIX)
&& !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_IDIOM_PREFIX)
- && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)
- && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_IDIOM_IMAGE_PREFIX)) {
+ && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)) {
result.setError(OAIPMHConstants.OAI_METADATA_FORMAT_ERROR,
"The value of the metadataPrefix: " + request.getMetadataPrefix()
+ " is not supported by the item identified by the value of: "
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 3abb2eb3..109532f6 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
@@ -9,7 +9,7 @@ import info.textgrid.middleware.oaipmh.ResumptionTokenType;
/**
* @author Maximilian Brodhun, SUB Göttingen
* @author Stefan E. Funk, SUB Göttingen
- * @version 2021-10-25
+ * @version 2022-09-07
* @since
*/
public abstract class RecordListDelivererAbstract implements RecordListDelivererInterface {
@@ -68,8 +68,7 @@ public abstract class RecordListDelivererAbstract implements RecordListDeliverer
if (request.getMetadataPrefix() != null
&& !request.getMetadataPrefix().equals(OAIPMHUtilities.OAIDC_PREFIX)
&& !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_IDIOM_PREFIX)
- && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)
- && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_IDIOM_IMAGE_PREFIX)) {
+ && !request.getMetadataPrefix().equals(OAIPMHConstants.METADATA_OPENAIRE_PREFIX)) {
result.setError(OAIPMHConstants.OAI_METADATA_FORMAT_ERROR,
"The value of the metadataPrefix " + request.getMetadataPrefix()
+ " is not supported by the item identified by the value of: "
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestTG.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestTG.java
index 5e419c8c..0a410c38 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestTG.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestTG.java
@@ -332,20 +332,6 @@ public class OaiPmhTestTG {
System.out.println("-----------------------------------\n");
}
- /**
- * @throws ParseException
- */
- @Test
- public void testGetRequestGetRecordIDIOMImages() throws ParseException {
-
- System.out.println("Test for the verb \"GetRecord\" with successful response");
- String p = this.request.getRequest("GetRecord", "11669",
- OAIPMHConstants.METADATA_IDIOM_IMAGE_PREFIX, "", "", "", "");
- System.out.println(p);
- System.out.println("-----------------------------------\n");
- }
-
-
/**
* @throws ParseException
*/
@@ -361,34 +347,6 @@ public class OaiPmhTestTG {
System.out.println("-----------------------------------\n");
}
- /**
- * @throws ParseException
- */
- @Test
- public void testGetRequestListRecordsIDIOMImages() throws ParseException {
-
- System.out.println("Test for the verb \"ListRecords\" with successful response for IMAGES");
-
- String p = this.request.getRequest("ListRecords", "",
- OAIPMHConstants.METADATA_IDIOM_IMAGE_PREFIX, "", "2019-08-01", "", "");
- System.out.println(p);
- System.out.println("-----------------------------------\n");
- }
-
- /**
- * @throws ParseException
- */
- @Test
- public void testGetRequestListIdentifiersIDIOMImages() throws ParseException {
-
- System.out.println("Test for the verb \"ListIdentifiers\" with successful response");
-
- String p = this.request.getRequest("ListIdentifiers", "",
- OAIPMHConstants.METADATA_IDIOM_IMAGE_PREFIX, "", "2016-08-01", "2021-11-10", "");
- System.out.println(p);
- System.out.println("-----------------------------------\n");
- }
-
/**
* @throws ParseException
*/
--
GitLab