From d994db6b143ec009da2d73f50744b00c93cfe6df Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Tue, 29 Oct 2019 16:29:18 +0100
Subject: [PATCH] Finish merge

---
 .../middleware/DublinCoreFieldLoader.java     | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 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 3e07a5bc..5afda202 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import javax.xml.datatype.DatatypeConfigurationException;
+import org.apache.commons.logging.LogFactory;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.search.SearchHit;
 
@@ -21,25 +22,23 @@ import org.elasticsearch.search.SearchHit;
  * 
  * @author Maximilian Brodhun, SUB Göttingen
  * @author Stefan E. Funk, SUB Göttingen
- * @version 2019-05-24
+ * @version 2019-10-29
  * @since 2014-02-18
  */
 public class DublinCoreFieldLoader {
 
+  // **
+  // STATICS
+  // **
+
+  private static org.apache.commons.logging.Log log = LogFactory.getLog(OAIPMHImpl.class);
+
   /**
    * @param hit contains results of the ElasticSearch request
    * @param fields containing all fields from ElasticSearch related to this Dublin Core field
    * @return all elements mapped from TetxGrid metadata scheme to Dublin Core
    */
   public static List<String> setContributor(SearchHit hit, String[] fields) {
-
-    List<String> contributors = new ArrayList<String>();
-
-    /*
-     * for (String field : fields) { if (hit.getFields().get(field) != null) {
-     * contributors.add(hit.getFields().get(field).getValues().get(0) .toString()); } }
-     */
-
     return fillList(hit, fields);
   }
 
@@ -94,13 +93,13 @@ public class DublinCoreFieldLoader {
    * @return all elements mapped from TetxGrid metadata scheme to Dublin Core
    */
   public static List<String> setDate(GetResponse responseWorkValues, String[] fields) {
-<<<<<<< HEAD
-    // TODO: transform to OAI-PMH certificated time stamp
-    return fillList(responseWorkValues, fields);
-=======
+
+    // TODO We don't need this here, I suppose? We have to check the dates here!
+    // return fillList(responseWorkValues, fields);
 
     List<String> dates = new ArrayList<String>();
 
+    // Transform to OAI-PMH certificated time stamp
     if (responseWorkValues.isExists()) {
       for (String field : fields) {
         try {
@@ -127,7 +126,6 @@ public class DublinCoreFieldLoader {
     }
 
     return dates;
->>>>>>> develop
   }
 
   /**
@@ -361,11 +359,9 @@ public class DublinCoreFieldLoader {
    * @return all elements mapped from TetxGrid metadata scheme to Dublin Core
    */
   public static List<String> setType(GetResponse responseWorkValues, String[] fields) {
-    // List<String> types = new ArrayList<String>();
     return fillList(responseWorkValues, fields);
   }
 
-
   /**
    * @param hit contains results of the ElasticSearch request
    * @param fields containing all fields from ElasticSearch related to this Dublin Core field
-- 
GitLab