Changeset 12364

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.

Location:

trunk

Files:

• gsdl/bin/java/LuceneWrap.jar (modified) ( previous)
• gsdl/bin/script/lucene_query.pl (modified) (2 diffs)
• gsdl/src/colservr/lucenesearch.cpp (modified) (3 diffs)
• gsdl/src/java/org/nzdl/gsdl/LuceneWrap/GS2LuceneQuery.java (modified) (3 diffs)
• indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneQuery.java (modified) (3 diffs)

trunk/gsdl/bin/script/lucene_query.pl

@@ -53 +53 @@
 {
     my $full_indexdir = shift(@_);
-    my $sort_field = shift(@_) || "";
-    my $out_file = shift(@_);
+    my $sort_field = 0;
+    my $dco = 0;
+    my $out_file = 0;
+    for ($i = 0; $i < scalar(@_); $i++)
+      {
+        if ($_[$i] eq "-sort")
+          {
+            $i++;
+            $sort_field = $_[$i];
+          }
+        elsif ($_[$i] eq "-dco")
+          {
+            $i++;
+            $dco = $_[$i];
+          }
+        else
+          {
+            $out_file = $_[$i];
+          }
+      }
+
+
     my $bin_java = &util::filename_cat($ENV{'GSDLHOME'},"bin","java");
     my $classpath = &util::filename_cat($bin_java,"LuceneWrap.jar");
@@ -66 +86 @@
     $out_file = "";
     }
-    if (!open (PIPEOUT, "| $java_cmd \"$full_indexdir\" $sort_field")) {
+
+    my $cmd = "| " . $java_cmd . " \"" . $full_indexdir . "\"";
+    if ($sort_field)
+      {
+        $cmd .= " -sort " . $sort_field;
+      }
+    if ($dco)
+      {
+        $cmd .= " -dco " . $dco;
+      }
+
+    print STDERR $cmd . "\n";
+
+    if (!open (PIPEOUT, $cmd)) {
     die "$PROGNAME - couldn't run $java_cmd\n";
     }

trunk/gsdl/src/colservr/lucenesearch.cpp

@@ -84 +84 @@
 }
 
-
 bool lucenesearchclass::search(const queryparamclass &queryparams, 
                    queryresultsclass &queryresult) {
@@ -107 +106 @@
   }
   
-  // set default Boolean combiner from all/some setting
-  // if match_mode == 1, ie all, default=1 ie AND
-  // if match_mode == 0, ie some, default=0, ie OR
-  int defaultBoolCombine = 0;
-  if (queryparams.match_mode){
-    defaultBoolCombine = 1;
-  }
-
   text_t utf8querystring = to_utf8(queryparams.querystring);
   cerr << "**** query string = " << utf8querystring << endl;
@@ -131 +122 @@
   cmd += (text_t)" \""+indexname + (text_t)"\" \"" + escaped_utf8querystring + (text_t)"\""; 
   if (!queryparams.sortfield.empty()) {
-    cmd += " \"" + queryparams.sortfield + "\"";
-  }
+    cmd += " -sort \"" + queryparams.sortfield + "\"";
+  }
+
+  // New code to support configuration of the default conjuction operator
+  // set default Boolean combiner from all/some setting
+  // if match_mode == 1, ie all, default=1 ie AND
+  // if match_mode == 0, ie some, default=0, ie OR
+  if (queryparams.match_mode)
+    {
+      cmd += " -dco AND";
+    }
+
   cerr << "Lucene command: " << cmd << endl;
  

trunk/gsdl/src/java/org/nzdl/gsdl/LuceneWrap/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() + "\"/>");
         }
 

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() + "\"/>");
         }