Fixed fetch count bug. Fixed advanced search filter bug where filter …

…did not work.
vivo-project · Oct 10, 2024 · 0cbec00 · 0cbec00
1 parent 3691ee4
commit 0cbec00
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 27 deletions.
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/elasticsearch/ESCounter.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchengine/elasticsearch/ESCounter.java
@@ -29,7 +29,7 @@ public ESCounter(String baseUrl) {
 
     public int count() throws SearchEngineException {
         try {
-            String url = baseUrl + "/_doc/_count";
+            String url = baseUrl + "/_count";
             HttpClient httpClient;
             if (baseUrl.startsWith("https")) {
                 httpClient = ESHttpsBasicClientFactory.getHttpClient();

diff --git a/...va/edu/cornell/mannlib/vitro/webapp/searchengine/elasticsearch/ExpressionTransformer.java b/...va/edu/cornell/mannlib/vitro/webapp/searchengine/elasticsearch/ExpressionTransformer.java
@@ -137,7 +137,7 @@ public static String fillInMissingOperators(String query) {
             String currentToken = tokens[i];
 
             if (!priorities.containsKey(currentToken) && !currentToken.contains(":") && !currentToken.equals(")")) {
-                currentToken = "ALLTEXT:" + currentToken;
+                currentToken = "ALLTEXT:" + currentToken + " OR nameLowercaseSingleValued:" + currentToken;
             }
 
             if (i > 0 && currentToken.contains(":") && !priorities.containsKey(tokens[i - 1])) {

diff --git a/...main/java/edu/cornell/mannlib/vitro/webapp/searchengine/elasticsearch/QueryConverter.java b/...main/java/edu/cornell/mannlib/vitro/webapp/searchengine/elasticsearch/QueryConverter.java
@@ -52,31 +52,32 @@ public QueryConverter(SearchQuery query) {
 
     private Map<String, Object> filteredOrNot() {
         ExpressionTransformer transformer = new ExpressionTransformer();
-        if (query.getFilters().isEmpty()) {
-            String queryForParsing = ExpressionTransformer.fillInMissingOperators(
-                ExpressionTransformer.removeWhitespacesFromRangeExpression(
-                    query.getQuery()
-                        .replace("(", "( ")
-                        .replace(")", " )")
-                ));
-            List<String> queryTokens = new ArrayList<>(Arrays.asList(queryForParsing.split(" ")));
-            queryTokens.removeIf(String::isEmpty);
-            String es8Query = BoolQuery.of(q -> {
-                q.must(transformer.parseAdvancedQuery(queryTokens));
-                return q;
-            })._toQuery().toString();
-            ObjectMapper objectMapper = new ObjectMapper();
-            try {
-                Map<String, Object> queryMap =
-                    objectMapper.readValue(es8Query.replaceFirst("Query: ", ""), new TypeReference<Map<String, Object>>() {
-                    });
-                return queryMap;
-            } catch (JsonProcessingException e) {
-                log.error("Query parsing for ES8 failed, falling back to old parsing method.");
-                return new QueryStringMap(query.getQuery()).map;
-            }
-        } else {
-            return buildFilterStructure();
+        StringBuilder queryForParsing = new StringBuilder("( " + ExpressionTransformer.fillInMissingOperators(
+            ExpressionTransformer.removeWhitespacesFromRangeExpression(
+                query.getQuery()
+                    .replace("(", "( ")
+                    .replace(")", " )")
+            )) + " )");
+
+        for (String filter : query.getFilters()) {
+            queryForParsing.append(" AND ").append(filter);
+        }
+
+        List<String> queryTokens = new ArrayList<>(Arrays.asList(queryForParsing.toString().split(" ")));
+        queryTokens.removeIf(String::isEmpty);
+        String es8Query = BoolQuery.of(q -> {
+            q.must(transformer.parseAdvancedQuery(queryTokens));
+            return q;
+        })._toQuery().toString();
+        ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            Map<String, Object> queryMap =
+                objectMapper.readValue(es8Query.replaceFirst("Query: ", ""), new TypeReference<Map<String, Object>>() {
+                });
+            return queryMap;
+        } catch (JsonProcessingException e) {
+            log.error("Query parsing for ES8 failed, falling back to old parsing method.");
+            return new QueryStringMap(query.getQuery()).map;
         }
     }