From 8d43c557b017e1d789f87f6503b76c31f099f787 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Thu, 17 Jun 2021 13:28:43 +0200
Subject: [PATCH] Add logging
---
.../IdentifierListDelivererAbstract.java | 15 +++++++++++++
.../middleware/IdentifierListDelivererDC.java | 22 ++++++++++---------
.../MetadataFormatListDelivererDH.java | 7 +-----
3 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
index 94a774d6..2ccfc997 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
@@ -68,6 +68,14 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
}
+ /**
+ * @param from
+ * @param until
+ * @param set
+ * @param resumptionToken
+ * @return
+ * @throws IOException
+ */
public List<String> getUriListOfAllEditions(String from, String until, String set, String resumptionToken) throws IOException {
/* InputStream input = null;
@@ -110,6 +118,13 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
return getConentFromESIndex(query, resumptionToken, set);
}
+ /**
+ * @param query
+ * @param resumptionToken
+ * @param set
+ * @return
+ * @throws IOException
+ */
private List<String> getConentFromESIndex(QueryBuilder query, String resumptionToken,
String set) throws IOException {
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
index 3df314a6..bcf678f9 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
@@ -18,7 +18,6 @@ import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
-
import info.textgrid.middleware.oaipmh.HeaderType;
import info.textgrid.middleware.oaipmh.ListIdentifiersType;
import info.textgrid.middleware.oaipmh.ResumptionTokenType;
@@ -79,8 +78,8 @@ public class IdentifierListDelivererDC extends IdentifierListDelivererAbstract {
private static ListIdentifiersType setListIdentifierHeader(String datestamp, String identifier,
ListIdentifiersType lit, String set) {
- // FIXME Delete this function and check for empty set string in setListIdentifierHeaderWithSet
-
+ // FIXME Delete this function and check for empty set string in setListIdentifierHeaderWithSet
+
HeaderType header = new HeaderType();
header.setDatestamp(datestamp);
header.setIdentifier(identifier);
@@ -120,9 +119,9 @@ public class IdentifierListDelivererDC extends IdentifierListDelivererAbstract {
String[] includes = this.identifierListFields;
String[] excludes = Strings.EMPTY_ARRAY;
- //TODO: necessary?
+ // TODO: necessary?
FetchSourceContext fetchSourceContext = new FetchSourceContext(true, includes, excludes);
-
+
SearchRequest searchRequest =
new SearchRequest(OAI_ESClient.getEsIndex()).searchType(SearchType.QUERY_THEN_FETCH);
@@ -161,9 +160,16 @@ public class IdentifierListDelivererDC extends IdentifierListDelivererAbstract {
String set, String resumptionToken) {
int i = 0;
- setResultSize(listFurtherValues.getHits().totalHits);
+ long size = listFurtherValues.getHits().totalHits;
+ setResultSize(size);
+
+ log.debug(" ## hits --> " + size);
+
for (SearchHit hit : listFurtherValues.getHits().getHits()) {
i++;
+
+ log.debug(" ## hit --> " + hit.getId());
+
if (this.textgrid) {
// hit.getSourceAsMap().get(this.dateOfObjectCreation).toString();
String datestamp = hit.getSourceAsMap().get(this.dateOfObjectCreation).toString();
@@ -175,19 +181,15 @@ public class IdentifierListDelivererDC extends IdentifierListDelivererAbstract {
log.debug(e1);
}
String identifier = hit.getSourceAsMap().get(this.identifierField).toString();
-
lit = setListIdentifierHeader(datestamp, identifier, lit, set);
}
if (this.dariah) {
-
this.datestamp = hit.getSourceAsMap().get(this.dateOfObjectCreation).toString();
try {
-
this.datestamp = hit.getSourceAsMap().get(this.dateOfObjectCreation).toString();
this.datestamp = OAIPMHUtilities.convertDateFormat(this.datestamp).toXMLFormat();
-
} catch (ParseException e1) {
log.debug(e1);
} catch (DatatypeConfigurationException e1) {
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererDH.java b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererDH.java
index adf6c2f5..97139997 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererDH.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererDH.java
@@ -12,7 +12,7 @@ public class MetadataFormatListDelivererDH extends MetadataFormatListDelivererAb
* @param dariah
*/
public MetadataFormatListDelivererDH() {
- //
+ // NOTE We do not have specific metadata formats for DHREP right now.
}
/*
@@ -23,11 +23,6 @@ public class MetadataFormatListDelivererDH extends MetadataFormatListDelivererAb
* String)
*/
public ListMetadataFormatsType setMetadataFormatList(String id) {
-
- System.out.println(" ## setMetadataFormatList ID --> " + id);
-
- // TODO Add DH specific method here!
-
return setMetadataFormatList();
}
--
GitLab