Changeset 5140

Timestamp:

2003-08-15T16:53:41+12:00 (21 years ago)

Author:

sjboddie

Message:

Fix for search term highlighting code so it no longer becomes confused
if the query string contains leading or trailing space.

File:

• trunk/gsdl/src/recpt/highlighttext.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/highlighttext.cpp

@@ -37 +37 @@
 
 static void get_phrase_terms (const text_t &querystring, text_tarray &phrase_terms);
+
+static void remove_space (text_t &qstring);
 
 // highlights text string by adding _starthighlight_ and _endhightlight_
@@ -65 +67 @@
     disp.expandstring("Global", "_endhighlight_", ehl);
   }
+
+  // remove leading and trailing whitespace
+  remove_space(querystring);
 
   if ((args["hl"] == 2) || ((*(querystring.begin()) == '"') && (*(querystring.end()-1) == '"'))) {
@@ -255 +260 @@
   }
 }
+
+void remove_space (text_t &qstring) {
+
+  text_t altered_string;
+  text_t space;
+
+  text_t::const_iterator here = qstring.begin();
+  text_t::const_iterator end = qstring.end();
+  while (here != end) {
+    if (is_unicode_space(*here)) {
+      space.push_back(*here);
+    } else {
+      if (!altered_string.empty()) {
+    altered_string += space;
+      }
+      space.clear();
+      altered_string.push_back(*here);
+    }
+    here++;
+  }
+
+  qstring = altered_string;
+}