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

Timestamp:

1999-07-16T12:19:02+12:00 (25 years ago)

Author:

sjboddie

Message:

some changes to the way quoted queries are handled

File:

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

trunk/gsdl/src/recpt/querytools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.3  1999/07/16 00:19:02  sjboddie
+   some changes to the way quoted queries are handled
+
    Revision 1.2  1999/07/07 06:12:21  rjmcnab
    Added ability to combine two independant queries.
@@ -29 +32 @@
 // request.filterResultOptions and request.fields (if required)
 // should be set by the calling function.
-// If the query string uses quotes (phrase-searching) the quoted
-// part of the string is returned in quotedstring (as something
-// of a side-effect ;-/
 
 bool do_query (FilterRequest_t &request, cgiargsclass &args, 
-           recptproto *collectproto, text_t &quotedstring, 
-           FilterResponse_t &response, ostream &logout) {
+           recptproto *collectproto, FilterResponse_t &response, 
+           ostream &logout) {
 
   request.filterName = "QueryFilter";
@@ -42 +42 @@
   OptionValue_t option;
   text_t formattedstring = args["q"];
-
-  // format the query string ready to do the query (and remember
-  // the quoted part for later)
-  format_querystring (formattedstring, quotedstring);
   
   option.name = "Term";
@@ -87 +83 @@
     request.filterOptions.push_back (option);
     
-    text_t quotedstring2;
     text_t formattedstring2 = args["q2"];
-    format_querystring (formattedstring2, quotedstring2);
+    format_querystring (formattedstring2);
 
     option.name = "Term";
@@ -149 +144 @@
 }
 
-void format_querystring (text_t &querystring, text_t &quotedstring) {
+void format_querystring (text_t &querystring) {
   text_t formattedstring;
-  quotedstring.clear();
 
   text_t::const_iterator here = querystring.begin();
   text_t::const_iterator end = querystring.end();
-  int foundquote = 0;
 
   // space is used to insert spaces between Chinese
@@ -169 +162 @@
       formattedstring.push_back(' ');
     } else {
-      if (*here == '"') {
-    if (foundquote) {foundquote = 0; quotedstring.push_back(*here);}
-    else foundquote = 1;
+      if ((*here >= 0x4e00 && *here <= 0x9fa5) ||
+      (*here >= 0xf900 && *here <= 0xfa2d)) {
+    // Chinese character
+    if (space) formattedstring.push_back (0x200b);
+    formattedstring.push_back (*here);
+    formattedstring.push_back (0x200b);
+    space = true;
       } else {
-    if ((*here >= 0x4e00 && *here <= 0x9fa5) ||
-        (*here >= 0xf900 && *here <= 0xfa2d)) {
-      // Chinese character
-      if (space) formattedstring.push_back (0x200b);
-      formattedstring.push_back (*here);
-      formattedstring.push_back (0x200b);
-      space = true;
-    } else {
-      // non-Chinese character
-      formattedstring.push_back (*here);
-      space = false;
-    }
+    // non-Chinese character
+    formattedstring.push_back (*here);
+    space = false;
       }
-      if (foundquote) quotedstring.push_back(*here);
     }
     here ++;
   }
-  querystring = formattedstring + quotedstring;
+  querystring = formattedstring;
 }