Changeset 32508

Timestamp:

2018-10-09T19:35:40+13:00 (6 years ago)

Author:

ak19

Message:

Continued from previous 2 commits: Properly spelled new method name and some better comments.

File:

• main/trunk/greenstone2/common-src/indexers/lucene-gs/src/org/greenstone/LuceneWrapper4/GS2LuceneQuery.java (modified) (4 diffs)

main/trunk/greenstone2/common-src/indexers/lucene-gs/src/org/greenstone/LuceneWrapper4/GS2LuceneQuery.java

@@ -172 +172 @@
 
         Query query = parseQuery(reader, query_parser, query_string, fuzziness);
-        query = recursiveRewriteQuery(query, reader);       
+        query = recursivelyRewriteQuery(query, reader);     
         // System.err.println("@@@@ final query class name: " + query.getClass());
 
@@ -473 +473 @@
     //    season*
     //    snail farm
-    // Idea for this method came from inspecting source code to BooleanQuery
-    // https://github.com/apache/lucene-solr/blob/master/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
+    // Idea for the solution of recursively processing a BooleanQuery came from inspecting source code to BooleanQuery.java
+    //    https://github.com/apache/lucene-solr/blob/master/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
     // which also does a recursive rewrite. Unfortunately, the existing BooleanQuery does not handle MultiTermQuery
     // subcomponents.
-    protected Query recursiveRewriteQuery(Query orig_query, IndexReader reader) throws java.io.IOException
+    protected Query recursivelyRewriteQuery(Query orig_query, IndexReader reader) throws java.io.IOException
     {
     //Query query = orig_query.rewrite(reader);
@@ -487 +487 @@
         for (BooleanClause clause : clauses) {
         Query subQuery = clause.getQuery();
-        subQuery = recursiveRewriteQuery(subQuery, reader);
+        subQuery = recursivelyRewriteQuery(subQuery, reader);
         clause.setQuery(subQuery);
         }
@@ -557 +557 @@
         }
 
+        // BooleanQuery.java recurses rewriting any query until it is identical before and after rewrite,
+        // see reference to "recursively rewrite" in
+        // https://github.com/apache/lucene-solr/blob/master/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
         if(orig_query == query) {
         return query;
         } else {
-        return recursiveRewriteQuery(query, reader);
+        return recursivelyRewriteQuery(query, reader);
         }
     }