Merge branch 'alpha' into add-drop-schema

alliance-genome · Sep 17, 2024 · 799a282 · 799a282
2 parents 9dc070f + 139254b
commit 799a282
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/org/alliancegenome/curation_api/dao/base/BaseSQLDAO.java b/src/main/java/org/alliancegenome/curation_api/dao/base/BaseSQLDAO.java
@@ -480,15 +480,17 @@ public SearchResponse<E> searchByParams(Pagination pagination, Map<String, Objec
 										BooleanPredicateClausesStep<?> clause = p.bool();
 										if (useKeywordFields != null && useKeywordFields) {
 											clause.should(p.match().field(field + "_keyword").matching(searchFilters.get(filterName).get(field).get("queryString").toString()).boost(boost + 500));
+										} else {
+											clause.should(p.match().field(field).matching(searchFilters.get(filterName).get(field).get("queryString").toString()).boost(boost));
 										}
-										clause.should(p.match().field(field).matching(searchFilters.get(filterName).get(field).get("queryString").toString()).boost(boost));
 										q.should(clause);
 									} else { // assume simple query
 										BooleanPredicateClausesStep<?> clause = p.bool();
 										if (useKeywordFields != null && useKeywordFields) {
 											clause.should(p.simpleQueryString().fields(field + "_keyword").matching(searchFilters.get(filterName).get(field).get("queryString").toString()).defaultOperator(booleanOperator).boost(boost + 500));
+										} else {
+											clause.should(p.simpleQueryString().fields(field).matching(searchFilters.get(filterName).get(field).get("queryString").toString()).defaultOperator(booleanOperator).boost(boost));
 										}
-										clause.should(p.simpleQueryString().fields(field).matching(searchFilters.get(filterName).get(field).get("queryString").toString()).defaultOperator(booleanOperator).boost(boost));
 										q.should(clause);
 									}
 									innerBoost--;