Changeset 10412

Timestamp:

2005-08-04T09:44:00+12:00 (19 years ago)

Author:

mdewsnip

Message:

Now escapes quotes so phrase searches with Lucene work.

File:

• trunk/gsdl/src/colservr/lucenesearch.cpp (modified) (1 diff)

trunk/gsdl/src/colservr/lucenesearch.cpp

@@ -115 +115 @@
     defaultBoolCombine = 1;
   }
-  char* utf8querystring=to_utf8(queryparams.querystring).getcstr();
+
+  text_t utf8querystring = to_utf8(queryparams.querystring);
   cerr << "**** query string = " << utf8querystring << endl;
+
+  text_t escaped_utf8querystring = "";
+  text_t::const_iterator here = utf8querystring.begin();
+  while (here != utf8querystring.end()) {
+    if (*here == '"') escaped_utf8querystring.push_back('\\');
+    escaped_utf8querystring.push_back(*here);
+    here++;
+  }
+  cerr << "**** escaped query string = " << escaped_utf8querystring << endl;
   cerr << "***** index name = " << indexname << endl;
 
   text_t cmd = "lucene_query.pl ";
-  cmd += (text_t)" \""+indexname + (text_t)"\" \"" + to_utf8(queryparams.querystring) + (text_t)"\""; 
+  cmd += (text_t)" \""+indexname + (text_t)"\" \"" + escaped_utf8querystring + (text_t)"\""; 
+  cerr << "Lucene command: " << cmd << endl;
  
   text_t xml_text = "";