From ce4fdea731657b17c13d4649fdd6cafcd93d4e09 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Thu, 1 Jul 2021 13:45:25 +0200
Subject: [PATCH] Delete some unused methods
---
.../middleware/DublinCoreFieldLoader.java | 86 +------------------
.../middleware/RecordListDelivererDC.java | 11 +--
2 files changed, 9 insertions(+), 88 deletions(-)
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
index 14fc9878..a1827e5d 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
@@ -154,86 +154,6 @@ public class DublinCoreFieldLoader {
return list;
}
- // /**
- // * @param hit
- // * @param fields
- // * @return
- // */
- // public static List<String> fillList(SearchHit hit, String[] fields) {
- // return fillList(hit, fields, "");
- // }
-
- // TODO Remove method, I just tried to fix things, we do another way now! --fu
- // /**
- // * @param hit
- // * @param fields
- // * @param prefix
- // * @return
- // */
- // public static List<String> fillList(SearchHit hit, String[] fields, String prefix) {
- //
- // List<String> list = new ArrayList<String>();
- //
- // System.out.println("i. fields: " + fields);
- //
- // if (fields != null) {
- // for (String field : fields) {
- //
- // System.out.println("ii. field: " + field);
- //
- // if (hit.getSourceAsMap().get(field) == null) {
- // String[] requestedField = field.split(OAIPMHUtilities.ES_DIVIDER_REGEXP);
- // Map<String, Object> nestedMap = hit.getSourceAsMap();
- // String valueOfRequestedField = null;
- // Map<String, Object> nestedMap2 = null;
- // // TODO Loop exactly what? --> Document!
- // for (int i = 0; i < requestedField.length; i++) {
- //
- // System.out.println("iii. field[" + i + "]: " + requestedField[i]);
- //
- // if (i < requestedField.length - 1 && nestedMap != null
- // && nestedMap.get(requestedField[i]) != null) {
- // try {
- // nestedMap2 = (Map<String, Object>) nestedMap.get(requestedField[i]);
- // } catch (ClassCastException e) {
- // e.printStackTrace();
- // }
- // }
- // if (i == requestedField.length - 1 && nestedMap2 != null
- // && nestedMap2.get(requestedField[i]) != null) {
- // valueOfRequestedField = nestedMap2.get(requestedField[i]).toString();
- //
- // System.out
- // .println("valueOfRequestedField.length(): " + valueOfRequestedField.length());
- //
- // if (valueOfRequestedField.length() > 0) {
- // // Only add list entry if prefix is empty or beginning with prefix otherwise!
- //
- // System.out.println("valueOfRequestedField: " + valueOfRequestedField);
- //
- // if (prefix.isEmpty() || valueOfRequestedField.startsWith(prefix)) {
- // list.add(valueOfRequestedField);
- // }
- // }
- // }
- // nestedMap = nestedMap2;
- // }
- // } else {
- // // Only add list entry if prefix is empty or beginning with prefix otherwise!
- // String value = hit.getSourceAsMap().get(field).toString();
- //
- // System.out.println("value: " + value);
- //
- // if (prefix.isEmpty() || value.startsWith(prefix)) {
- // list.add(value);
- // }
- // }
- // }
- // }
- //
- // return list;
- // }
-
/**
* @param hit
* @param fields
@@ -246,7 +166,7 @@ public class DublinCoreFieldLoader {
if (fields != null) {
for (String field : fields) {
if (hit.getSourceAsMap().get(field) == null) {
- String[] requestedField = field.split("\\.");
+ String[] requestedField = field.split(OAIPMHUtilities.ES_DIVIDER_REGEXP);
Map<String, Object> nestedMap = hit.getSourceAsMap();
String valueOfRequestedField = null;
Map<String, Object> nestedMap2 = null;
@@ -255,8 +175,8 @@ public class DublinCoreFieldLoader {
&& nestedMap.get(requestedField[i]) != null) {
try {
nestedMap2 = (Map<String, Object>) nestedMap.get(requestedField[i]);
- } catch (ClassCastException cce) {
-
+ } catch (ClassCastException e) {
+ e.printStackTrace();
}
}
if (i == requestedField.length - 1 &&
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
index 2ed249c1..a215b71c 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
@@ -5,7 +5,6 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.text.ParseException;
import java.util.Hashtable;
-import java.util.List;
import java.util.Map;
import javax.xml.datatype.DatatypeConfigurationException;
import org.apache.commons.logging.LogFactory;
@@ -324,8 +323,9 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
result.setDescription(
DublinCoreFieldLoader.fillList(responseWorkValues, this.descriptionList));
result.setFormat(DublinCoreFieldLoader.fillList(hit, this.formatList));
- //result.setIdentifier(DublinCoreFieldLoader.fillList(hit, this.identifierList));
- result.setIdentifier(OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), fields));
+ // result.setIdentifier(DublinCoreFieldLoader.fillList(hit, this.identifierList));
+ result.setIdentifier(OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()),
+ this.fields));
result.setLanguage(DublinCoreFieldLoader.fillList(hit, this.languageList));
result.setPublisher(DublinCoreFieldLoader.fillList(hit, this.publisherList));
result.setRelation(DublinCoreFieldLoader.fillList(hit, this.relationList));
@@ -358,8 +358,9 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
result.setDate(DublinCoreFieldLoader.fillList(hit, this.dateList));
result.setDescription(DublinCoreFieldLoader.fillList(hit, this.descriptionList));
result.setFormat(DublinCoreFieldLoader.fillList(hit, this.formatList));
- //result.setIdentifier(DublinCoreFieldLoader.fillList(hit, this.identifierList));
- result.setIdentifier(OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), fields));
+ // result.setIdentifier(DublinCoreFieldLoader.fillList(hit, this.identifierList));
+ result.setIdentifier(
+ OAIPMHUtilities.fieldLoader(new JSONObject(hit.getSourceAsMap()), this.fields));
result.setLanguage(DublinCoreFieldLoader.fillList(hit, this.languageList));
result.setPublisher(DublinCoreFieldLoader.fillList(hit, this.publisherList));
result.setRelation(DublinCoreFieldLoader.fillList(hit, this.relationList));
--
GitLab