From 8b91a50125f1bfd0c8d7ec1dfa2cea203a84048d Mon Sep 17 00:00:00 2001
From: Maximilian Brodhun <brodhun@sub.uni-goettingen.de>
Date: Mon, 27 May 2019 16:55:18 +0200
Subject: [PATCH] changes
---
.../info/textgrid/middleware/OAIPMHImpl.java | 3 ++-
.../middleware/RecordListDelivererDC.java | 20 ++++++++++++++++---
.../RecordListDelivererInterface.java | 2 --
.../middleware/OaiPmhTextgridOnlineTests.java | 2 +-
4 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
index 71020a6d..873dd2c7 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
@@ -354,7 +354,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
JAXBElement<OAIPMHType> oaipmhRoot = obf.createOAIPMH(oai);
ErrorHandler requestErrors = RecordListDelivererAbstract.requestChecker(request);
-
+ //System.out.println("DU KOMMST NICHT VORBEI!!!");
if (requestErrors.getError().getCode() != null) {
oai.getError().add(requestErrors.getError());
} else {
@@ -364,6 +364,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
if (RecordListDelivererAbstract.isIdiomMets()) {
recListDeliv = this.recordListIDIOM;
} else if (RecordListDelivererAbstract.isDublinCore()) {
+ //System.out.println("UHLA");
recListDeliv = this.recordListDC;
}
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 49b57ba2..4d0929c4 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
@@ -138,7 +138,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
*/
public void fetchFields(QueryBuilder query, ListRecordsType recordList, String resumptionToken,
String set) throws UnsupportedEncodingException {
-
+ System.out.println("fetchFields");
String scrollID = "";
SearchResponse scrollResp;
QueryBuilder recordFilter;
@@ -146,8 +146,10 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
if (this.dariah == true) {
recordFilter = query;
} else {
+ System.out.println("GOING INTO TEXTGRID");
recordFilter = QueryBuilders.boolQuery().must(query)
.must(QueryBuilders.matchPhraseQuery(this.formatField, this.formatToFilter));
+ System.out.println("recordFilter: " + recordFilter);
}
if (resumptionToken == null) {
@@ -170,7 +172,10 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
log.info("Life time for resumption token is set to: " + lifeTimeResToken);
scrollID = scrollResp.getScrollId();
-
+ System.out.println("Treffer: " + scrollResp.getHits().totalHits());
+ System.out.println("Query: " + recordFilter);
+ System.out.println("TextGrid: " + textgrid);
+ System.out.println("DARIAH: " + dariah);
long completeListSize = scrollResp.getHits().totalHits();
if (completeListSize > 0) {
setFoundItems(true);
@@ -340,8 +345,12 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
ListRecordsType recordList = new ListRecordsType();
QueryBuilder query;
QueryBuilder rangeQuery = QueryBuilders.rangeQuery(this.rangeField).from(from).to(to);
-
+ System.out.println("rangeQuery: " + rangeQuery);
+ System.out.println("DARIAH bla: " + dariah);
+ System.out.println("TextGrid bla: " + textgrid);
+ System.out.println("SET: " + set);
if (set != null) {
+ System.out.println("NO SET");
String queryField = "";
String valueField = "";
@@ -351,6 +360,7 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
}
if (this.textgrid == true) {
+ System.out.println("BY THE POWER OF GRAYSKULL");
String[] setParts = set.split(":");
if (setParts[0].equals("project")) {
queryField = "project.id";
@@ -359,10 +369,14 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
}
QueryBuilder matchQuery = QueryBuilders.matchPhraseQuery(queryField, valueField);
+ System.out.println("matchQuery: " + matchQuery);
QueryBuilder boolQuery = QueryBuilders.boolQuery().must(rangeQuery).must(matchQuery);
+ System.out.println("boolQuery: " + boolQuery );
query = boolQuery;
+ System.out.println("builded query: " + query);
} else {
query = rangeQuery;
+ System.out.println("QUERY WITHOUT SET: " + query);
}
try {
fetchFields(query, recordList, resumptionToken, set);
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererInterface.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererInterface.java
index aa3d0bd5..8fa99ea2 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererInterface.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererInterface.java
@@ -2,11 +2,9 @@ package info.textgrid.middleware;
import info.textgrid.middleware.oaipmh.HeaderType;
import info.textgrid.middleware.oaipmh.ListRecordsType;
-import info.textgrid.middleware.oaipmh.RecordType;
public interface RecordListDelivererInterface {
- //public RecordType buildRecord(ListRecordsType recordList, String set, String headerIdentifier);
public ListRecordsType getRecords(String from, String to, String set, String resumptionToken);
public HeaderType setHeader(String set, String headerIdentifier);
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
index b335f09d..709c6e94 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java
@@ -885,4 +885,4 @@ public class OaiPmhTextgridOnlineTests {
}
-}
+}
\ No newline at end of file
--
GitLab