From ad9b3b7be5e1c2eb6abf23a4a30f6c2c819c852f Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Wed, 7 Jul 2021 12:16:46 +0200
Subject: [PATCH] Remove range var

---
 .../middleware/RecordDelivererAbstract.java       | 15 +++++++--------
 oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml   |  7 ++-----
 2 files changed, 9 insertions(+), 13 deletions(-)

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 09504b04..f6a9ba3e 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
@@ -40,8 +40,7 @@ public abstract class RecordDelivererAbstract implements RecordDelivererInterfac
   protected String[] languageList;
   protected String[] publisherList;
   protected String[] relationList;
-  // FIXME Why is this commented out? I just adapted beans.xml file.
-  // protected String[] relationsForWorkList;
+  protected String[] relationsForWorkList;
   protected String[] rightList;
   protected String[] sourceList;
   protected String[] subjectList;
@@ -260,12 +259,12 @@ public abstract class RecordDelivererAbstract implements RecordDelivererInterfac
     this.relationList = relationsList;
   }
 
-  // /**
-  // * @param relationsForWorkList
-  // */
-  // public void setRelationsForWork(String[] relationsForWorkList) {
-  // this.relationsForWorkList = relationsForWorkList;
-  // }
+  /**
+   * @param relationsForWorkList
+   */
+  public void setRelationsForWork(String[] relationsForWorkList) {
+    this.relationsForWorkList = relationsForWorkList;
+  }
 
   /**
    * @param rightsList
diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
index a2ded6a1..a4c44fa3 100644
--- a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
+++ b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
@@ -106,10 +106,11 @@
 		<constructor-arg index="1" value="${dariah}" />
 
 		<!-- Properties from abstract class -->
-
 		<property name="fields" value="${fields}" />
 		<property name="workFields" value="${workFields}" />
 
+		<property name="formatField" value="${formatField}" />
+		<property name="formatToFilter" value="${formatToFilter}" />
 		<property name="dateOfObjectCreation"
 			value="${dateOfObjectCreation}" />
 		<property name="relationToFurtherMetadataObject"
@@ -117,12 +118,8 @@
 		<property name="repositoryObjectURIPrefix"
 			value="${repositoryObjectURIPrefix}" />
 		<property name="identifierField" value="${identifierField}" />
-		<property name="rangeField" value="${rangeField}" />
-		<property name="formatField" value="${formatField}" />
-		<property name="formatToFilter" value="${formatToFilter}" />
 
 		<!-- Properties from DC implementation class -->
-
 		<property name="contributor" value="${contributorList}" />
 		<property name="coverage" value="${coverageList}" />
 		<property name="creator" value="${creatorList}" />
-- 
GitLab