Changeset 10411

Timestamp:

2005-08-03T18:02:41+12:00 (19 years ago)

Author:

mdewsnip

Message:

Added some code to fix bugs in Lucene "all" and phrase searching with a plain search form.

File:

• trunk/gsdl/src/recpt/querytools.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/querytools.cpp

@@ -632 +632 @@
   int argb = args.getintarg("b"); // b=0 simple, b=1 advanced
 
+  // Special code for Lucene
+  // The default operator for Lucene is "or", so we need to add "+" symbols when t == 0
+  // Also, we need to be careful not to mess up phrase searches
+  if (argct == 2) {
+    text_t processed_querystring = "";
+    text_t queryelement = "";
+    text_t combine = ((argt == 0) ? "+" : "");
+    bool in_phrase = false;
+    text_t::const_iterator here = querystring.begin();
+    text_t::const_iterator end = querystring.end();
+    while (here != end) {
+      if (is_unicode_letdig(*here)) {
+    queryelement.push_back(*here);
+      }
+
+      // Detect phrase starts/finishes
+      else if (*here == '"') {
+    queryelement.push_back(*here);
+    if (in_phrase == false) in_phrase = true;
+    else if (in_phrase == true) {
+      add_field_info(queryelement, tag, argct);
+      processed_querystring += combine + queryelement;
+      queryelement.clear();
+      in_phrase = false;
+    }
+      }
+
+      // Found word boundary
+      else if (in_phrase) {
+    queryelement.push_back(*here);
+      }
+      else {
+    if (!queryelement.empty()) {
+      add_field_info(queryelement, tag, argct);
+      processed_querystring += combine + queryelement;
+      queryelement.clear();
+    }
+    processed_querystring.push_back(*here);
+      }
+
+      ++here;
+    }
+
+    // Get last element
+    if (!queryelement.empty()) {
+      add_field_info(queryelement, tag, argct);
+      processed_querystring += combine + queryelement;
+    }
+
+    querystring = processed_querystring;
+    return;
+  }
+
   if (argb==0 && argt==0) {
     // simple 'and' search - just put tag info round whole query string
@@ -671 +724 @@
     outtext += word;
   }
-  
+
   querystring =  outtext;
 }