ensure all synonym queries have equal standing in the parsed query, s…

…o synonyms aren't penalized when there are >2, fixes #33
healthonnet · Nov 1, 2013 · ce99a8e · ce99a8e
1 parent 26330c0
commit ce99a8e
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/main/java/org/apache/solr/search/SynonymExpandingExtendedDismaxQParserPlugin.java b/src/main/java/org/apache/solr/search/SynonymExpandingExtendedDismaxQParserPlugin.java
@@ -372,18 +372,18 @@ private void applySynonymQueries(Query query, List<Query> synonymQueries, float
                     Query mainUserQuery = booleanClause.getQuery();
                     mainUserQuery.setBoost(originalBoost);
 
-                    // combine all synonym queries together with the same boost
-                    BooleanQuery allSynonymQueries = new BooleanQuery();
+                    // add all synonyms queries separately, each with the synonym boost
+                    BooleanQuery combinedQuery = new BooleanQuery();
+                    combinedQuery.add(mainUserQuery, Occur.SHOULD);
+
                     for (Query synonymQuery : synonymQueries) {
-                        allSynonymQueries.add(synonymQuery, Occur.SHOULD);
+                        BooleanQuery booleanSynonymQuery = new BooleanQuery();
+                        booleanSynonymQuery.add(synonymQuery, Occur.SHOULD);
+                        booleanSynonymQuery.setBoost(synonymBoost);
+
+                        combinedQuery.add(booleanSynonymQuery, Occur.SHOULD);
                     }
 
-                    allSynonymQueries.setBoost(synonymBoost);
-
-                    // now combine with the original main user query
-                    BooleanQuery combinedQuery = new BooleanQuery();
-                    combinedQuery.add(mainUserQuery, Occur.SHOULD);
-                    combinedQuery.add(allSynonymQueries, Occur.SHOULD);
                     booleanClause.setQuery(combinedQuery);
                     queryToHighlight = combinedQuery;
                 }