Changeset 3160 for trunk/gsdl/src/recpt/querytools.cpp

Timestamp:

2002-06-21T14:42:45+12:00 (22 years ago)

Author:

kjdon

Message:

no longer format query strings inside fields. two or more words are now
ANDed together, not considered a phrase.

File:

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

trunk/gsdl/src/recpt/querytools.cpp

@@ -290 +290 @@
 }
 
-// search history tool
+// search history tool 
+// also used for form query macros
 text_t escape_quotes(const text_t &querystring) {
 
@@ -334 +335 @@
   for (int i=0; i< values.size(); i++) {
     if (!values[i].empty()) {
-      text_t text = formatelem(values[i]);
-      addqueryelem(querystring, fields[i], text, combine);
-    }
-  }
-  
-}
-
-text_t formatelem(text_t &text) {
-
-  text_t::iterator here = text.begin();
-  text_t::iterator end = text.end();
-
-  bool space = false;
-  int words = 0;
-  text_t newtext = "";
-  while (here != end) {
-    if (is_unicode_letdig(*here)) {
-      newtext.push_back(*here);
-      if (space==false) words++;
-      space = true;
-    }
-    else {
-      if (space) {
-    newtext.push_back(' ');
-    space = false;
-      }
-    }
-    here++;
-  }
-
-  if (words > 1) { // have a phrase, put it in quotes
-    newtext = "\""+newtext+"\"";
-  }
-  return newtext;
-}
+      addqueryelem(querystring, fields[i], values[i], combine);
+    }
+  }
+  
+}
+
 
 void parse_adv_query_form(text_t &querystring, cgiargsclass &args){
@@ -407 +379 @@
     else if (combs[i-1]=="not")combine = "!";
       }
-      text_t term = formatelem(values[i]);
-      term = addstemcase(term, stems[i], folds[i]);
+      text_t term = addstemcase(values[i], stems[i], folds[i]);
       addqueryelem(querystring, fields[i], term, combine);
     }
@@ -477 +448 @@
  
   }
-  if (tag=="ZZ") { // just add onto querystring
+  if (tag=="ZZ" || tag=="") { // just add onto querystring
        querystring +=  query;
   }