Changeset 32509 for main/trunk

Timestamp:

2018-10-09T19:46:17+13:00 (6 years ago)

Author:

ak19

Message:

After changes in last 3 commits, reinstating the possible Too_Many_Clauses outcome when expanding a wildcard query to its query terms. (e.g. it occurs when searching for something like a*.)

File:

• main/trunk/greenstone2/common-src/indexers/lucene-gs/src/org/greenstone/LuceneWrapper4/GS2LuceneQuery.java (modified) (5 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 = recursivelyRewriteQuery(query, reader);     
+        query = recursivelyRewriteQuery(query, reader, lucene_query_result);        
         // System.err.println("@@@@ final query class name: " + query.getClass());
 
@@ -477 +477 @@
     // which also does a recursive rewrite. Unfortunately, the existing BooleanQuery does not handle MultiTermQuery
     // subcomponents.
-    protected Query recursivelyRewriteQuery(Query orig_query, IndexReader reader) throws java.io.IOException
+    protected Query recursivelyRewriteQuery(Query orig_query, IndexReader reader, LuceneQueryResult lucene_query_result) throws java.io.IOException
     {
     //Query query = orig_query.rewrite(reader);
@@ -487 +487 @@
         for (BooleanClause clause : clauses) {
         Query subQuery = clause.getQuery();
-        subQuery = recursivelyRewriteQuery(subQuery, reader);
+        subQuery = recursivelyRewriteQuery(subQuery, reader, lucene_query_result);
         clause.setQuery(subQuery);
         }
@@ -529 +529 @@
         // and you'll hit this exception
 
-        //lucene_query_result.setError(LuceneQueryResult.TOO_MANY_CLAUSES_ERROR);
+        lucene_query_result.setError(LuceneQueryResult.TOO_MANY_CLAUSES_ERROR);
 
         if(query instanceof MultiTermQuery) {
@@ -563 +563 @@
         return query;
         } else {
-        return recursivelyRewriteQuery(query, reader);
+        return recursivelyRewriteQuery(query, reader, lucene_query_result);
         }
     }