Merge branch 'rpb-266-spatialData' of https://github.com/hbz/rpb into main

Resolves https://jira.hbz-nrw.de/browse/RPB-266

Author: fsteeg

app/controllers/nwbib/Application.java

@@ -401,7 +401,7 @@ public static Result classification(final String t) {
 			}
 			result = classificationResult(t, placeholder);
 		}
-		Cache.set("classification." + t, result, ONE_DAY);
+		Cache.set("classification." + t, result);
 		return result;
 	}
 

app/controllers/nwbib/Classification.java

@@ -73,6 +73,7 @@
  */
 public class Classification {
 
+	private static final int MAX_RESULT_WINDOW = 15000;
 	private static final String RPB_SPATIAL = "https://rpb.lobid.org/spatial#";
 	private static final String INDEX = "rpb";
 
@@ -164,11 +165,10 @@ public JsonNode buildRegister() {
 		}
 
 		private SearchResponse classificationData() {
-			int maxSize = 10000; // default max_result_window
 			MatchAllQueryBuilder matchAll = QueryBuilders.matchAllQuery();
 			SearchRequestBuilder requestBuilder = client.prepareSearch(INDEX)
 					.setSearchType(SearchType.DFS_QUERY_THEN_FETCH).setQuery(matchAll)
-					.setTypes(elasticsearchType).setFrom(0).setSize(maxSize);
+					.setTypes(elasticsearchType).setFrom(0).setSize(MAX_RESULT_WINDOW);
 			return requestBuilder.execute().actionGet();
 		}
 	}
@@ -492,6 +492,7 @@ public static void indexStartup() {
 				.put("path.home", new File(".").getAbsolutePath())//
 				.put("http.port", httpPort)//
 				.put("transport.tcp.port", tcpPort)//
+				.put("cluster.routing.allocation.disk.threshold_enabled", false)//
 				.build(), Arrays.asList(Netty4Plugin.class));
 		try {
 			node.start();
@@ -506,6 +507,8 @@ public static void indexStartup() {
 			indexData(CONFIG.getString("index.data.rpbsubject"), Type.NWBIB);
 			indexData(CONFIG.getString("index.data.rpbspatial"), Type.SPATIAL);
 			client.admin().indices().refresh(new RefreshRequest()).actionGet();
+			Settings indexSettings = Settings.builder().put("max_result_window", MAX_RESULT_WINDOW).build();
+			client.admin().indices().prepareUpdateSettings().setSettings(indexSettings).setIndices(INDEX).get();
 		}
 	}
 

app/controllers/nwbib/Lobid.java

@@ -222,15 +222,7 @@ public static long getTotalHitsNwbibClassification(String value) {
 			initAggregation("spatial.id");
 			initAggregation("subject.id");
 		}
-		return AGGREGATION_COUNT.containsKey(value)
-				? AGGREGATION_COUNT.getOrDefault(value, 0L) : lobidRequest(value);
-	}
-
-	private static Long lobidRequest(String value) {
-		return request("", "", "", "", "", "", "", "", value, "", 0, 1, "", "", "",
-				"", "", "", "").get().map((WSResponse response) -> {
-					return getTotalResults(response.asJson());
-				}).get(Lobid.API_TIMEOUT);
+		return AGGREGATION_COUNT.getOrDefault(value, 0L);
 	}
 
 	private static void initAggregation(String field) {