Changeset 12390 for trunk/indexers

Timestamp:

2006-08-03T13:19:12+12:00 (18 years ago)

Author:

mdewsnip

Message:

More fixes, many thanks to John Thompson and DL Consulting Ltd.

File:

• trunk/indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneQuery.java (modified) (2 diffs)

trunk/indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneQuery.java

@@ -75 +75 @@
 
         // Lucene does "OR" queries by default; do an "AND" query if specified
-        if (default_conjuction_operator.equals("AND")) {
-        query_parser.setDefaultOperator(query_parser.AND_OPERATOR);
-        query_parser_no_stop_words.setDefaultOperator(query_parser.AND_OPERATOR);
-        }
+        if (default_conjuction_operator.equals("AND"))
+                {
+                    query_parser.setDefaultOperator(query_parser.AND_OPERATOR);
+                    query_parser_no_stop_words.setDefaultOperator(query_parser.AND_OPERATOR);
+                }
 
         BufferedReader in = new BufferedReader(new InputStreamReader(System.in, "UTF-8"));
-        while (true) {
-        // Read the query from STDIN
-        String query_string = in.readLine();
-        if (query_string == null || query_string.length() == -1) {
-            break;
-        }
-        ///ystem.err.println("**** query = " + query_string);
-
-        Query query_including_stop_words = query_parser_no_stop_words.parse(query_string);
-        query_including_stop_words = query_including_stop_words.rewrite(reader);
+        while (true)
+                {
+                    // Read the query from STDIN
+                    String query_string = in.readLine();
+                    if (query_string == null || query_string.length() == -1)
+                        {
+                            break;
+                        }
+                    ///ystem.err.println("**** query = " + query_string);
+
+                    Query query_including_stop_words = query_parser_no_stop_words.parse(query_string);
+                    query_including_stop_words = query_including_stop_words.rewrite(reader);
 
                 // Split query string into the search terms and the filter terms
@@ -201 +204 @@
                         ///ystem.err.println("Rewritten Fuzzy query: " + query.toString());
                     }
-
+                else
+                    {
+                        query = query_parser.parse(query_prefix + query_suffix);
+                        query = query.rewrite(reader);
+                    }
 
         // Perform the query