From 81668935da35f0bfd15ef583bcb2cd64b7dcf53d Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Wed, 7 Jul 2021 15:40:42 +0200
Subject: [PATCH] Add some logging
---
.../RecordListDelivererAbstract.java | 2 +-
.../middleware/RecordListDelivererDC.java | 21 +++++++------------
.../middleware/RecordListDelivererIDIOM.java | 2 --
3 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
index 29d6cd14..1980f2ca 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
@@ -41,7 +41,7 @@ public abstract class RecordListDelivererAbstract implements RecordListDeliverer
protected String formatToFilter;
protected int searchResponseSize;
- private String modifiedValue;
+ protected String modifiedValue;
private long resultSize;
private boolean foundItems;
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 409d0cb8..e5aec8aa 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
@@ -47,12 +47,6 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
private static org.apache.commons.logging.Log log = LogFactory.getLog(OAIPMHImpl.class);
protected static Map<String, Integer> cursorCollector = new Hashtable<String, Integer>();
- // **
- // CLASS VARIABLES
- // **
-
- private String modifiedValue;
-
// **
// DC-Field Lists
// **
@@ -94,8 +88,6 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
*/
public GetResponse furtherDCElements(String id, RestHighLevelClient client) {
- System.out.println(" ## id: " + (id == null ? "NULL" : id));
-
if (id != null) {
try {
id = URLDecoder.decode(id, "UTF-8");
@@ -142,6 +134,10 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
QueryBuilder recordFilter;
DublinCoreBuilder dublinCoreBuilder = new DublinCoreBuilder();
+ System.out.println("formatField: " + (this.formatField == null ? "NULL" : this.formatField));
+ System.out
+ .println("formatToFilter: " + (this.formatToFilter == null ? "NULL" : this.formatToFilter));
+
if (this.dariah == true) {
// All objects!
recordFilter = query;
@@ -242,6 +238,9 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
e.printStackTrace();
}
+ System.out.println(
+ "ID field: " + (this.identifierField == null ? "NULL" : this.identifierField));
+
buildRecord(recordList, set,
hit.getSourceAsMap().get(this.identifierField).toString(), dublinCoreBuilder,
setSpec);
@@ -465,12 +464,6 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
+ (resumptionToken != null ? resumptionToken : "resumptionToken=NULL") + " | "
+ (set != null ? set : "set=NULL"));
- System.out.println(
- "getRecords(): " + (query != null ? "queryName=" + query.getName() : "query=NULL") + " | "
- + (recordList != null ? recordList : "recordList=NULL") + " | "
- + (resumptionToken != null ? resumptionToken : "resumptionToken=NULL") + " | "
- + (set != null ? set : "set=NULL"));
-
fetchFields(query, recordList, resumptionToken, set);
} catch (UnsupportedEncodingException e) {
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 f1ea370e..061fd2ed 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
@@ -36,7 +36,6 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
* @param dariah
*/
public RecordListDelivererIDIOM(boolean textgrid, boolean dariah) {
-
super(textgrid, dariah);
}
@@ -92,7 +91,6 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
searchSourceBuilder.size(30);
searchRequest.source(searchSourceBuilder);
-
if (resumptionToken != null) {
SearchScrollRequest scrollRequest = new SearchScrollRequest(resumptionToken);
scrollRequest.scroll(TimeValue.timeValueHours(24L));
--
GitLab