From eb4b9524ba581effce36d0fe20ebc612f9dd9add Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Thu, 22 Jul 2021 16:56:19 +0200
Subject: [PATCH] Rebuild old OpenAireRecordList class...
---
.../info/textgrid/middleware/OAIPMHImpl.java | 17 +++++++-------
.../textgrid/middleware/OaiPmhTestDH.java | 7 +++---
.../textgrid/middleware/OaiPmhTestTG.java | 22 ++++++++++++-------
.../src/main/webapp/WEB-INF/beans.xml | 12 +++++-----
4 files changed, 34 insertions(+), 24 deletions(-)
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 04fca5f6..4eafc78e 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
@@ -55,8 +55,8 @@ public class OAIPMHImpl implements OAIPMHProducer {
private RecordListDelivererDC recordListDC;
private RecordListDelivererIDIOM recordListIDIOM;
- // private OpenAireRecordList openAireRecordList;
- private RecordListDelivererDATACITE recordListDATACITE;
+ private OpenAireRecordList openAireRecordList;
+ // private RecordListDelivererDATACITE recordListDATACITE;
private RecordDelivererDC recordDC;
private RecordDelivererIDIOM recordIDIOM;
@@ -100,8 +100,8 @@ public class OAIPMHImpl implements OAIPMHProducer {
RecordDelivererDATACITE recordDATACITE, // 3
RecordListDelivererDC recordListDC, // 4
RecordListDelivererIDIOM recordListIDIOM, // 5
- // OpenAireRecordList openAireRecordList, // 6
- RecordListDelivererDATACITE recordListDATACITE, // 6
+ OpenAireRecordList openAireRecordList, // 6
+ // RecordListDelivererDATACITE recordListDATACITE, // 6
MetadataFormatListDelivererInterface metadataFormatList, // 7
SetListDeliverer setList, // 8
IdentifierListDelivererDC identifierList, // 9
@@ -118,8 +118,8 @@ public class OAIPMHImpl implements OAIPMHProducer {
this.recordListDC = recordListDC;
this.recordListIDIOM = recordListIDIOM;
- // this.openAireRecordList = openAireRecordList;
- this.recordListDATACITE = recordListDATACITE;
+ this.openAireRecordList = openAireRecordList;
+ // this.recordListDATACITE = recordListDATACITE;
this.identifierListDC = identifierList;
this.identifierListIDIOM = identifierListIDIOM;
@@ -538,7 +538,8 @@ public class OAIPMHImpl implements OAIPMHProducer {
recListDeliv = this.recordListIDIOM;
}
if (request.getMetadataPrefix().equals(TGConstants.METADATA_OPENAIRE_PREFIX)) {
- recListDeliv = this.recordListDATACITE;
+ recListDeliv = this.openAireRecordList;
+ // recListDeliv = this.recordListDATACITE;
}
}
@@ -559,7 +560,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
} else if (restokIDIOMExisting) {
recListDeliv = this.recordListIDIOM;
} else if (restokOpenAireExisting) {
- recListDeliv = this.recordListDATACITE;
+ recListDeliv = this.openAireRecordList;
}
}
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestDH.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestDH.java
index 92a7fb0b..319920cb 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestDH.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestDH.java
@@ -25,8 +25,8 @@ public class OaiPmhTestDH {
// private static OpenAireRecord openAireRecord;
private static RecordDelivererDATACITE recordDATACITE;
- // private static OpenAireRecordList openAireRecordList;
- private static RecordListDelivererDATACITE recordListDATACITE;
+ private static OpenAireRecordList openAireRecordList;
+ // private static RecordListDelivererDATACITE recordListDATACITE;
// private static OpenAireIdentifierList openAireIdentifierList;
private static IdentifierListDelivererDATACITE identifierListDATACITE;
@@ -51,7 +51,8 @@ public class OaiPmhTestDH {
OaiPmhTestDH.recordDATACITE,
OaiPmhTestDH.recordList,
OaiPmhTestDH.recordListIDIOM,
- OaiPmhTestDH.recordListDATACITE,
+ // OaiPmhTestDH.recordListDATACITE,
+ OaiPmhTestDH.openAireRecordList,
OaiPmhTestDH.metadataFormatList,
OaiPmhTestDH.setListDARIAH,
OaiPmhTestDH.identifierList,
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 d527d3db..b940da84 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestTG.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTestTG.java
@@ -32,8 +32,8 @@ public class OaiPmhTestTG {
private static RecordDelivererIDIOM recordIDIOM;
// private static OpenAireRecord openAireRecord;
private static RecordDelivererDATACITE recordDATACITE;
- // private static OpenAireRecordList openAireRecordList;
- private static RecordListDelivererDATACITE recordListDATACITE;
+ private static OpenAireRecordList openAireRecordList;
+ // private static RecordListDelivererDATACITE recordListDATACITE;
// private static OpenAireIdentifierList openAireIdentifierList;
private static IdentifierListDelivererDATACITE identifierListDATACITE;
private static RecordListDelivererDC recordList;
@@ -60,7 +60,8 @@ public class OaiPmhTestTG {
OaiPmhTestTG.recordDATACITE,
OaiPmhTestTG.recordList,
OaiPmhTestTG.recordListIDIOM,
- OaiPmhTestTG.recordListDATACITE,
+ // OaiPmhTestTG.recordListDATACITE,
+ OaiPmhTestTG.openAireRecordList,
this.metadataFormatList,
OaiPmhTestTG.setListTextGrid,
OaiPmhTestTG.identifierList,
@@ -375,11 +376,16 @@ public class OaiPmhTestTG {
@Ignore
public void testLIstRecordsOpenAire() throws IOException {
- recordListDATACITE.setOaiEsClient(oaiEsClient);
- recordListDATACITE.setRangeField(TGConstants.RANGE_FIELD);
- recordListDATACITE.setFormatField(TGConstants.FORMAT);
- recordListDATACITE.setFormatToFilter(TextGridMimetypes.EDITION);
- recordListDATACITE.setSearchResponseSize(100);
+ // recordListDATACITE.setOaiEsClient(oaiEsClient);
+ // recordListDATACITE.setRangeField(TGConstants.RANGE_FIELD);
+ // recordListDATACITE.setFormatField(TGConstants.FORMAT);
+ // recordListDATACITE.setFormatToFilter(TextGridMimetypes.EDITION);
+ // recordListDATACITE.setSearchResponseSize(100);
+ openAireRecordList.setOaiEsClient(oaiEsClient);
+ openAireRecordList.setRangeField(TGConstants.RANGE_FIELD);
+ openAireRecordList.setFormatField(TGConstants.FORMAT);
+ openAireRecordList.setFormatToFilter(TextGridMimetypes.EDITION);
+ openAireRecordList.setSearchResponseSize(100);
String p = this.request.getRequest("ListRecords", "", TGConstants.METADATA_OPENAIRE_PREFIX, "",
"", "", "");
diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
index d1421ede..dc752e0f 100644
--- a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
+++ b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
@@ -55,8 +55,8 @@
<constructor-arg ref="RecordDATACITE" />
<constructor-arg ref="RecordListDC" />
<constructor-arg ref="RecordListIDIOM" />
- <!-- constructor-arg ref="OpenAireRecordList" / -->
- <constructor-arg ref="RecordListDATACITE" />
+ <constructor-arg ref="OpenAireRecordList" />
+ <!-- constructor-arg ref="RecordListDATACITE" / -->
<constructor-arg ref="${metadataFormatListInstance}" />
<constructor-arg ref="ListSet" />
<constructor-arg ref="ListIdentifierDC" />
@@ -317,9 +317,11 @@
</bean>
- <!-- <bean id="OpenAireRecordList" class="info.textgrid.middleware.OpenAireRecordList">
- <constructor-arg index="0" value="${textgrid}" /> <constructor-arg index="1"
- value="${dariah}" /> </bean> -->
+ <bean id="OpenAireRecordList"
+ class="info.textgrid.middleware.OpenAireRecordList">
+ <constructor-arg index="0" value="${textgrid}" />
+ <constructor-arg index="1" value="${dariah}" />
+ </bean>
<bean id="RecordListDATACITE"
class="info.textgrid.middleware.RecordListDelivererDATACITE">
--
GitLab