From 3f84fe549f8d9903f0b8d821bdf206c5d4880ba1 Mon Sep 17 00:00:00 2001
From: Maximilian Behnert-Brodhun <behnert-brodhun@sub.uni-goettingen.de>
Date: Mon, 5 Jul 2021 15:03:19 +0200
Subject: [PATCH] Don't use old Syntax for fetching field content from ES
---
.../textgrid/middleware/IdentifierListDelivererIDIOM.java | 5 +++--
.../info/textgrid/middleware/RecordListDelivererIDIOM.java | 6 ++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
index 9f574428..f2df0dbe 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
@@ -74,7 +74,7 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
SearchResponse scrollResp;
- SearchRequest searchRequest = new SearchRequest(OAI_ESClient.getEsIndex());
+ SearchRequest searchRequest = new SearchRequest("textgrid-nonpublic");
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
scrollResp = null;
@@ -96,7 +96,8 @@ public class IdentifierListDelivererIDIOM extends IdentifierListDelivererAbstrac
// Use given resumption token here.
searchRequest.source(searchSourceBuilder);
searchRequest.scroll(TimeValue.timeValueHours(24L));
- // scrollResp = OAI_ESClient.getEsClient().prepareSearchScroll(resumptionToken)
+ scrollResp = OAI_ESClient.getEsClient().search(searchRequest, RequestOptions.DEFAULT);
+ //scrollResp = OAI_ESClient.getEsClient().prepareSearchScroll(resumptionToken)
// .setScroll(TimeValue.timeValueHours(24L)).execute().actionGet();
}
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 6a338cf4..a73eaf63 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
@@ -9,12 +9,14 @@ import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchScrollRequest;
import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.common.Strings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.query.RangeQueryBuilder;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
import org.json.JSONObject;
import info.textgrid.middleware.oaipmh.HeaderType;
@@ -74,6 +76,10 @@ public class RecordListDelivererIDIOM extends RecordListDelivererAbstract {
// FIXME BUFFFFF???????? AAAAAAHHHHHHH!!!!!!
System.out.println("BUFF");
+
+ String[] includes = new String[] {"lastModifie", "project.id", "format", "notes", "textgridUri"};
+ String[] excludes = Strings.EMPTY_ARRAY;
+ FetchSourceContext fetchSourceContext = new FetchSourceContext(true, includes, excludes);
ListRecordsType recordList = new ListRecordsType();
BoolQueryBuilder recordFilterForClassicMayan;
--
GitLab