Changeset 397 for trunk/gsdl/src/recpt/queryaction.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/queryaction.cpp (modified) (8 diffs)

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