Changeset 12364 for trunk/gsdl/src/colservr

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/gsdl/src/colservr/lucenesearch.cpp (modified) (3 diffs)

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;