Merge pull request #525 from kagemomiji/issue317-change-order-of-sear…

…ch-result #317 change order of search result
kagemomiji · Jun 28, 2024 · 86b12ee · 86b12ee
2 parents 9314197 + 2aa81e9
commit 86b12ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/airsonic-main/src/main/java/org/airsonic/player/service/search/QueryFactory.java b/airsonic-main/src/main/java/org/airsonic/player/service/search/QueryFactory.java
@@ -116,11 +116,14 @@ private Query createMultiFieldWildQuery(String[] fieldNames, String queryString,
                 List<Query> fieldQuerys = new ArrayList<>();
                 while (stream.incrementToken()) {
                     String token = stream.getAttribute(CharTermAttribute.class).toString();
+                    TermQuery termQuery = new TermQuery(new Term(fieldName, token));
                     WildcardQuery wildcardQuery = new WildcardQuery(new Term(fieldName, token.concat(ASTERISK)));
                     if (indexType.getBoosts().containsKey(fieldName)) {
+                        fieldQuerys.add(new BoostQuery(termQuery, indexType.getBoosts().get(fieldName) * 0.5f));
                         fieldQuerys.add(new BoostQuery(wildcardQuery, indexType.getBoosts().get(fieldName)));
                     } else {
                         fieldQuerys.add(wildcardQuery);
+                        fieldQuerys.add(new BoostQuery(termQuery, 0.5f));
                     }
                 }
                 fieldsQuerys.add(fieldQuerys);

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
         <java.version>17</java.version>
         <cxf.version>4.0.4</cxf.version>
         <snakeyaml.version>2.2</snakeyaml.version>
-        <lucene.version>9.11.0</lucene.version>
+        <lucene.version>9.11.1</lucene.version>
         <docker.container.repo>ghcr.io/kagemomiji/airsonic-advanced</docker.container.repo>
         <docker.java.version>17.0.10_7</docker.java.version>
     </properties>