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

Timestamp:

1999-08-25T16:47:55+12:00 (25 years ago)

Author:

sjboddie

Message:

added advanced search option - other minor changes

File:

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

trunk/gsdl/src/recpt/querytools.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.5  1999/08/25 04:47:55  sjboddie
+   added advanced search option - other minor changes
+
    Revision 1.4  1999/07/19 00:16:58  sjboddie
    no longer display documents that don't match all phrases in query string
@@ -45 +48 @@
   OptionValue_t option;
   text_t formattedstring = args["q"];
-  
+  format_querystring (formattedstring, args.getintarg("b"));  
+
   option.name = "Term";
   option.value = formattedstring;
@@ -87 +91 @@
     
     text_t formattedstring2 = args["q2"];
-    format_querystring (formattedstring2);
+    format_querystring (formattedstring2, args.getintarg("b"));
 
     option.name = "Term";
@@ -147 +151 @@
 }
 
-void format_querystring (text_t &querystring) {
+void format_querystring (text_t &querystring, int querymode) {
   text_t formattedstring;
 
@@ -159 +163 @@
 
   // want to remove ()|!& from querystring so boolean queries are just
-  // "all the words" queries
+  // "all the words" queries (unless querymode is advanced)
   while (here != end) {
-    if (*here == '(' || *here == ')' || *here == '|' ||
-    *here == '!' || *here == '&') {
+    if ((querymode == 0) && (*here == '(' || *here == ')' || *here == '|' ||
+                 *here == '!' || *here == '&')) {
       formattedstring.push_back(' ');
     } else {