Changeset 397 for trunk/gsdl/src/recpt

Timestamp:

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

Author:

sjboddie

Message:

some changes to the way quoted queries are handled

Location:

trunk/gsdl/src/recpt

Files:

• documentaction.cpp (modified) (2 diffs)
• queryaction.cpp (modified) (8 diffs)
• queryaction.h (modified) (1 diff)
• querytools.cpp (modified) (6 diffs)
• querytools.h (modified) (1 diff)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.12  1999/07/16 00:19:01  sjboddie
+   some changes to the way quoted queries are handled
+
    Revision 1.11  1999/07/07 05:47:41  sjboddie
    changed around the way browsetools works
@@ -638 +641 @@
     FilterRequest_t request;
     request.filterResultOptions = FRmatchTerms;
-    text_t quotedquery; // not used
-    if (do_query (request, args, collectproto, quotedquery, queryresponse, logout))
+    if (do_query (request, args, collectproto, queryresponse, logout))
       highlight = true;
   }

trunk/gsdl/src/recpt/queryaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.13  1999/07/16 00:19:01  sjboddie
+   some changes to the way quoted queries are handled
+
    Revision 1.12  1999/07/09 02:17:55  rjmcnab
    Setting macros needed for a second query.
@@ -282 +285 @@
 }
 
-void queryaction::define_internal_macros (displayclass &/*disp*/, cgiargsclass &/*args*/, 
+void queryaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
                       recptproto */*collectproto*/, ostream &/*logout*/) {
 
-  // define_internal_macros doesn't set anything for this action. The following
-  // macros are set later though in define_query_macros (they can't be set until 
-  // the query has been done).
+  // define_internal_macros doesn't sets the following macros.
+
+  // _quotedquery_  the part of the query string that was quoted for post-processing
+
+
+
+  // The following macros are set later (in define_query_macros) as they can't be set until 
+  // the query has been done.
 
   // _freqmsg_      the term frequency string
-
-  // _quotedquery_  the part of the query string that was quoted for post-processing
 
   // _resultline_   the "x documents matched the query" string
@@ -301 +307 @@
   // _thisfirst_
   // _thislast_
-  
+
+
+
+  // get the quoted bits of the query string and set _quotedquery_
+  text_t &arg_q = args["q"];
+  if (!arg_q.empty()) {
+
+    text_t::const_iterator end = arg_q.end();
+    text_t::const_iterator here = findchar (arg_q.begin(), end, '\"');
+    if (here != end) {
+      text_t quotedquery, tmptext;
+      bool first = true;
+      bool foundquote = false;
+      while (here != end) {
+    if (*here == '\"') {
+      if (foundquote) {
+        if (!tmptext.empty()) {
+          if (!first) quotedquery += " and ";
+          else first = false;
+          quotedquery += "\"" + tmptext + "\"";
+          tmptext.clear();
+        }
+        foundquote = false;
+      } else foundquote = true;
+    } else {
+      if (foundquote) tmptext.push_back (*here);
+    }
+    here ++;
+      }
+      disp.setmacro ("quotedquery", "query", quotedquery);
+    }
+  }
 }
 
@@ -405 +442 @@
     FilterRequest_t request;
     FilterResponse_t response;
-    text_t quotedstring;
     format_t *formatlistptr = new format_t();
 
@@ -412 +448 @@
     // do the query
     request.filterResultOptions = FROID | FRmetadata | FRtermFreq;
-    if (!do_query (request, args, collectproto, quotedstring, response, logout))
+    if (!do_query (request, args, collectproto, response, logout))
       return false;
     
     // set macros 
-    define_query_macros (args, disp, response, quotedstring);
+    define_query_macros (args, disp, response);
     
     // output the header
@@ -430 +466 @@
       textout << outconvert << disp << "<tr>\n"
 
-//            << "<td valign=top nowrap>r: " << (*this_doc).ranking
-//            << " t: " << (*this_doc).num_terms_matched << " p: "
-//            << (*this_doc).num_phrase_match << "</td>\n"
+    //            << "<td valign=top nowrap>r: " << (*this_doc).ranking
+    //            << " t: " << (*this_doc).num_terms_matched << " p: "
+    //            << (*this_doc).num_phrase_match << "</td>\n"
     
           << get_formatted_string (*this_doc, formatlistptr) << "\n"
@@ -454 +490 @@
 // _thisfirst_, and _thislast_
 void queryaction::define_query_macros (cgiargsclass &args, displayclass &disp, 
-                       const FilterResponse_t &response, 
-                       const text_t &quotedstring) {
+                       const FilterResponse_t &response) { 
 
   int numdocs = response.numDocs;
@@ -472 +507 @@
   }
   
-  disp.setmacro ("quotedquery", "query", quotedstring);
   disp.setmacro ("freqmsg", "query", freqmsg);
 

trunk/gsdl/src/recpt/queryaction.h

@@ -24 +24 @@
 
   void define_query_macros (cgiargsclass &args, displayclass &disp, 
-                const FilterResponse_t &response, 
-                const text_t &quotedstring);
+                const FilterResponse_t &response); 
+
   void set_option_macro (const text_t &macroname, text_t current_value,
              const FilterOption_t &option, displayclass &disp);

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;
 }
 

trunk/gsdl/src/recpt/querytools.h

@@ -18 +18 @@
 
 bool do_query (FilterRequest_t &request, cgiargsclass &args, 
-           recptproto *collectproto, text_t &quotedstring, 
-           FilterResponse_t &response, ostream &logout);
-void format_querystring (text_t &querystring, text_t &quotedstring);
+           recptproto *collectproto, FilterResponse_t &response, 
+           ostream &logout);
+void format_querystring (text_t &querystring);
 
 #endif