From 43aa1940fd2cf172a181972b93430894fdcb33c2 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Thu, 21 Oct 2021 12:40:01 +0200
Subject: [PATCH] Reform idiom metadata response size name
---
.../middleware/IdentifierListDelivererIDIOM.java | 16 ++++++++--------
.../middleware/RecordListDelivererIDIOM.java | 16 ++++++++--------
oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml | 7 +++----
.../main/webapp/WEB-INF/oaipmh.dariah.properties | 6 ++++++
.../webapp/WEB-INF/oaipmh.textgrid.properties | 2 +-
5 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
index 8bb9ef05..2233390c 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
@@ -26,7 +26,7 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
private static Log log = LogFactory.getLog(IdentifierListDelivererIDIOM.class);
// Set default to 30, can be changed in oaipmh.properties.
- private int theVerySpecialIDIOMResponseSize = 30;
+ private int idiomResponseSize = 30;
/**
* @param textgrid
@@ -72,7 +72,7 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
scrollResp = null;
searchSourceBuilder.query(recordFilterForClassicMayan);
- searchSourceBuilder.size(this.theVerySpecialIDIOMResponseSize);
+ searchSourceBuilder.size(this.idiomResponseSize);
searchRequest.source(searchSourceBuilder);
if (resumptionToken != null) {
@@ -128,7 +128,7 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
// Check the need for a resumption token!
ResumptionTokenType resTokenForResponse = OAIPMHUtilities.getResumptionToken(completeListSize,
- resumptionToken, cursorCollector, scrollID, this.theVerySpecialIDIOMResponseSize, i);
+ resumptionToken, cursorCollector, scrollID, this.idiomResponseSize, i);
if (resTokenForResponse != null) {
identifierList.setResumptionToken(resTokenForResponse);
}
@@ -142,15 +142,15 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
/**
* @return
*/
- public int getTheVerySpecialIDIOMRepsonseSize() {
- return this.theVerySpecialIDIOMResponseSize;
+ public int getIdiomResponseSize() {
+ return this.idiomResponseSize;
}
/**
- * @param theVerySpecialIDIOMRepsonseSize
+ * @param idiomResponseSize
*/
- public void setTheVerySpecialIDIOMRepsonseSize(int theVerySpecialIDIOMRepsonseSize) {
- this.theVerySpecialIDIOMResponseSize = theVerySpecialIDIOMRepsonseSize;
+ public void setTheVerySpecialIDIOMRepsonseSize(int idiomResponseSize) {
+ this.idiomResponseSize = idiomResponseSize;
}
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
index 884570fd..8a1600ff 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
@@ -26,7 +26,7 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
private static Log log = LogFactory.getLog(RecordListDelivererIDIOM.class);
// Set default to 30, can be changed in oaipmh.properties.
- private int theVerySpecialIDIOMResponseSize = 30;
+ private int idiomResponseSize = 30;
/**
* @param textgrid
@@ -67,7 +67,7 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
scrollResp = null;
searchSourceBuilder.query(recordFilterForClassicMayan);
- searchSourceBuilder.size(this.theVerySpecialIDIOMResponseSize);
+ searchSourceBuilder.size(this.idiomResponseSize);
searchRequest.source(searchSourceBuilder);
log.info("resToken: " + resumptionToken);
if (resumptionToken != null) {
@@ -118,7 +118,7 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
// Check the need for a resumption token!
ResumptionTokenType resTokenForResponse = OAIPMHUtilities.getResumptionToken(completeListSize,
- resumptionToken, cursorCollector, scrollID, this.theVerySpecialIDIOMResponseSize, i);
+ resumptionToken, cursorCollector, scrollID, this.idiomResponseSize, i);
if (resTokenForResponse != null) {
recordList.setResumptionToken(resTokenForResponse);
}
@@ -132,15 +132,15 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
/**
* @return
*/
- public int getTheVerySpecialIDIOMResponseSize() {
- return this.theVerySpecialIDIOMResponseSize;
+ public int getIdiomResponseSize() {
+ return this.idiomResponseSize;
}
/**
- * @param theVerySpecialIDIOMResponseSize
+ * @param idiomResponseSize
*/
- public void setTheVerySpecialIDIOMResponseSize(int theVerySpecialIDIOMResponseSize) {
- this.theVerySpecialIDIOMResponseSize = theVerySpecialIDIOMResponseSize;
+ public void setTheVerySpecialIDIOMResponseSize(int idiomResponseSize) {
+ this.idiomResponseSize = idiomResponseSize;
}
}
diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
index 1d58ff0f..a5cf5527 100644
--- a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
+++ b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
@@ -281,8 +281,7 @@
<!-- TODO Why we don't need any property definitions here? -->
- <property name="theVerySpecialIDIOMResponseSize"
- value="${theVerySpecialIDIOMResponseSize}" />
+ <property name="idiomResponseSize" value="${idiomResponseSize}" />
</bean>
<bean id="RecordListDATACITE"
@@ -349,8 +348,8 @@
value="${identifierListFields}"></property>
<property name="identifierField" value="${identifierField}" />
<property name="specFieldPrefix" value="${specFieldPrefix}" />
- <property name="theVerySpecialIDIOMResponseSize"
- value="${theVerySpecialIDIOMResponseSize}" />
+ <property name="idiomResponseSize"
+ value="${idiomResponseSize}" />
</bean>
<bean id="ListIdentifierDATACITE"
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 b055113c..b99f3870 100644
--- a/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.dariah.properties
+++ b/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.dariah.properties
@@ -109,3 +109,9 @@ searchResponseSize = 100
specField = administrativeMetadata.dcterms:relation
specFieldPrefix = hdl:
+
+########################################
+### IDIOM Metadata Format Settings ###
+########################################
+
+idiomResponseSize = 30
diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.textgrid.properties b/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.textgrid.properties
index 4aac284a..a9d3317f 100644
--- a/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.textgrid.properties
+++ b/oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.textgrid.properties
@@ -116,4 +116,4 @@ specFieldPrefix = project:
### IDIOM Metadata Format Settings ###
########################################
-theVerySpecialIDIOMResponseSize = 30
+idiomResponseSize = 30
--
GitLab