Changeset 12364 for trunk/indexers

Timestamp:

2006-08-01T11:33:37+12:00 (18 years ago)

Author:

mdewsnip

Message:

Now uses the t variable to control whether a "some" or "all" search is done with Lucene. Many thanks to John Thompson and DL Consulting Ltd.

File:

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

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

@@ -39 +39 @@
         Searcher searcher = new IndexSearcher(args[0]);
         Sort sorter = new Sort();
-        if (args.length > 1) {
-        sorter = new Sort(args[1]);
-        }
+            // New code to allow the default conjunction operator to be
+            // definable
+            String default_conjuction_operator = "OR";
+            for (int i = 1; i < args.length; i++)
+                {
+                    if (args[i].equals("-sort"))
+                        {
+                            i++;
+                            sorter = new Sort(args[i]);
+                        }
+                    if (args[i].equals("-dco"))
+                        {
+                            i++;
+                            default_conjuction_operator = args[i];
+                        }
+                }
+
         Analyzer analyzer = new StandardAnalyzer();
         IndexReader reader = ((IndexSearcher) searcher).getIndexReader();
@@ -56 +70 @@
         // Parse the query and rewrite it into individual terms (eg. for wildcard searches)
         QueryParser query_parser = new QueryParser("TX", analyzer);
+                // Set the default conjuction operator
+                System.err.println("**** DCO = " + default_conjuction_operator);
+                if (default_conjuction_operator.equals("AND"))
+                    {
+                        query_parser.setDefaultOperator(query_parser.AND_OPERATOR);
+                    }
+                // Otherwise its OR
+
         Query query = query_parser.parse(query_string);
         query = query.rewrite(reader);
@@ -71 +93 @@
         while (iter.hasNext()) {
             Term term = (Term) iter.next();
-            System.out.println("  <Term value=\"" + term.text() + "\" freq=\"" + reader.docFreq(term) + "\"/>");
+                    //System.out.println("  <Term value=\"" + term.text() + "\" freq=\"" + reader.docFreq(term) + "\"/>");
+            System.out.println("  <Term value=\"" + term.text() + "\" freq=\"" + reader.docFreq(term) + "\" field=\"" + term.field() + "\"/>");
         }