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 93c8d24ffe45aba1eb0c274739383e9501cfbf34..baac2e476146ebe56f9c622ff8d81f73271e6ac8 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
@@ -97,7 +97,9 @@ public abstract class IdentifierListDelivererAbstract implements IdentifierListD
queryField = TGConstants.PROJECT_ID_FOR_TEXTGRID;
valueField = setParts[1];
}
- System.out.println("");
+
+ log.debug("");
+
QueryBuilder matchQuery = QueryBuilders.matchPhraseQuery(queryField, valueField);
QueryBuilder boolQuery =
QueryBuilders.boolQuery().must(rangeQuery).must(matchQuery).mustNot(filterSandBox);
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererAbs.java b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererAbs.java
index 42844f8bd4fed4b385b82c660388d69849806e3c..b4ee3d96e130c7864d3b540a3930cd31638d6e4d 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererAbs.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDelivererAbs.java
@@ -40,8 +40,6 @@ public abstract class MetadataFormatListDelivererAbs
mft.setSchema(OAIPMHUtilities.OAIDC_SCHEMA_LOCATION);
result.getMetadataFormat().add(mft);
- System.out.println(" ## ListMetadataFormatsType --> " + result.getMetadataFormat());
-
return result;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
index d542db6ef145ea82f789ac3b5b80359af81e36f4..60dccc19c169e0982e1d00a374f2411306fa44a4 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtilities.java
@@ -445,7 +445,9 @@ public class OAIPMHUtilities {
if (i < fieldPathForESIndex.length - 1) {
try {
singlePath = singlePath.getJSONObject(fieldPathForESIndex[i]);
- System.out.println(singlePath);
+
+ log.debug("singlePath: " + singlePath);
+
} catch (JSONException notFound) {
return null;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
index b7df75d7430e51a25b0eeddb3b7c2f737e98a123..93855416d941d06510d97a48c63c43219c4625a4 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
@@ -74,7 +74,7 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
// changedId = changedId.substring(0,changedId.length() - 1) + "0";
changedId = changedId + ".0";
}
-
+
if (changedId.contains(".1")) {
changedId = changedId.replace(".1", "");
}
@@ -112,9 +112,10 @@ public class RecordDelivererIDIOM extends RecordDelivererAbstract {
json = new JSONObject(OAIPMHUtilities
.getRcordByIDFromElasticSearch(changedId, fields, Strings.EMPTY_ARRAY).getSource());
- System.out.println("id in elasticsearch is: " + OAIPMHUtilities
+ log.debug("id in elasticsearch is: " + OAIPMHUtilities
.datestampAsString(OAIPMHUtilities.fieldLoader(json, TGConstants.CREATED)));
- System.out.println(json);
+ log.debug(json);
+
this.dateOfObjectCreation =
OAIPMHUtilities.datestampAsString(OAIPMHUtilities.fieldLoader(json, TGConstants.CREATED));
// objectInDatabase.getField(TGConstants.CREATED).getValue().toString();
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 feddb14930f096d3e8e16b0f42002b41223cb0d7..b1fa256b0090e030817b0d8285b1f2074b91145b 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
@@ -19,7 +19,6 @@ import org.elasticsearch.index.query.RangeQueryBuilder;
import org.elasticsearch.index.search.MultiMatchQuery.QueryBuilder;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
-
import info.textgrid.middleware.oaipmh.HeaderType;
import info.textgrid.middleware.oaipmh.ListRecordsType;
import info.textgrid.middleware.oaipmh.MetadataType;
@@ -72,83 +71,87 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
@Override
public ListRecordsType getRecords(final String from, final String to, final String set,
-
+
final String resumptionToken) throws ParseException, IOException {
- System.out.println("BUFF");
- ListRecordsType recordList = new ListRecordsType();
- //
- BoolQueryBuilder recordFilterForClassicMayan;
- RangeQueryBuilder rangeQuery;
-
- rangeQuery = QueryBuilders.rangeQuery("lastModified").from(from).to(to);
-
- recordFilterForClassicMayan = QueryBuilders.boolQuery().must(rangeQuery)
- .must(QueryBuilders.matchPhraseQuery("project.id",
- "TGPR-0e926f53-1aba-d415-ecf6-539edcd8a318"))
- .must(QueryBuilders.matchPhraseQuery("format", "text/tg.inputform+rdf+xml"))
- .must(QueryBuilders.matchPhraseQuery("notes", "ARTEFACT"));
-
- SearchResponse scrollResp;
-
- SearchRequest searchRequest = new SearchRequest(OAI_ESClient.getEsIndex());
- SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-
- scrollResp = null;
-
- searchSourceBuilder.query(recordFilterForClassicMayan);
- searchSourceBuilder.size(30);
+
+ // FIXME BUFFFFF???????? AAAAAAHHHHHHH!!!!!!
+ System.out.println("BUFF");
+
+ ListRecordsType recordList = new ListRecordsType();
+
+ BoolQueryBuilder recordFilterForClassicMayan;
+ RangeQueryBuilder rangeQuery;
+
+ rangeQuery = QueryBuilders.rangeQuery("lastModified").from(from).to(to);
+
+ recordFilterForClassicMayan = QueryBuilders.boolQuery().must(rangeQuery)
+ .must(QueryBuilders.matchPhraseQuery("project.id",
+ "TGPR-0e926f53-1aba-d415-ecf6-539edcd8a318"))
+ .must(QueryBuilders.matchPhraseQuery("format", "text/tg.inputform+rdf+xml"))
+ .must(QueryBuilders.matchPhraseQuery("notes", "ARTEFACT"));
+
+ SearchResponse scrollResp;
+
+ SearchRequest searchRequest = new SearchRequest(OAI_ESClient.getEsIndex());
+ SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+
+ scrollResp = null;
+
+ searchSourceBuilder.query(recordFilterForClassicMayan);
+ searchSourceBuilder.size(30);
+ searchRequest.source(searchSourceBuilder);
+
+
+ if (resumptionToken == null) {
+
+ SearchScrollRequest scrollRequest = new SearchScrollRequest(resumptionToken);
+ scrollRequest.scroll(TimeValue.timeValueHours(24L));
+ try {
+ scrollResp = OAI_ESClient.getEsClient().scroll(scrollRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ } else {
searchRequest.source(searchSourceBuilder);
-
-
- if (resumptionToken == null) {
-
- SearchScrollRequest scrollRequest = new SearchScrollRequest(resumptionToken);
- scrollRequest.scroll(TimeValue.timeValueHours(24L));
- try {
- scrollResp = OAI_ESClient.getEsClient().scroll(scrollRequest, RequestOptions.DEFAULT);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }else {
- searchRequest.source(searchSourceBuilder);
- searchRequest.scroll(TimeValue.timeValueHours(24L));
- try {
- scrollResp = OAI_ESClient.getEsClient().search(searchRequest, RequestOptions.DEFAULT);
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ searchRequest.scroll(TimeValue.timeValueHours(24L));
+ try {
+ scrollResp = OAI_ESClient.getEsClient().search(searchRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
}
+ }
+
+ String scrollID = scrollResp.getScrollId();
- String scrollID = scrollResp.getScrollId();
-
- long completeListSize = scrollResp.getHits().totalHits;
- //long completeListSize = 45;
-
- if (completeListSize > 0) {
- setFoundItems(true);
- int i = 0;
-
- for (SearchHit hit : scrollResp.getHits().getHits()) {
- i++;
- String textgridURI = hit.getFields().get("textgridUri").getValue().toString().replace(".0","");
- // System.out.println("Processing: " + textgridURI);
- RecordDelivererIDIOM idiomRecord = new RecordDelivererIDIOM(true, false);
- recordList.getRecord().add(idiomRecord.getRecordById(textgridURI).getRecord());
- }
+ long completeListSize = scrollResp.getHits().totalHits;
+ // long completeListSize = 45;
+
+ if (completeListSize > 0) {
+ setFoundItems(true);
+ int i = 0;
+
+ for (SearchHit hit : scrollResp.getHits().getHits()) {
+ i++;
+ String textgridURI =
+ hit.getFields().get("textgridUri").getValue().toString().replace(".0", "");
+ // System.out.println("Processing: " + textgridURI);
+ RecordDelivererIDIOM idiomRecord = new RecordDelivererIDIOM(true, false);
+ recordList.getRecord().add(idiomRecord.getRecordById(textgridURI).getRecord());
+ }
// Check the need for a resumption token!
ResumptionTokenType resTokenForResponse = OAIPMHUtilities.getResumptionToken(
- completeListSize, resumptionToken, cursorCollector, scrollID, 30, i);
- if (resTokenForResponse != null) {
- recordList.setResumptionToken(resTokenForResponse);
- }
- }else {
- setFoundItems(false);
+ completeListSize, resumptionToken, cursorCollector, scrollID, 30, i);
+ if (resTokenForResponse != null) {
+ recordList.setResumptionToken(resTokenForResponse);
}
-
- return recordList;
-
+ } else {
+ setFoundItems(false);
+ }
+
+ return recordList;
+
}
/*