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

Timestamp:

1999-11-02T10:56:12+13:00 (25 years ago)

Author:

sjboddie

Message:

changes for cross-collection searching - still needs work

File:

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

trunk/gsdl/src/recpt/querytools.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.8  1999/11/01 21:56:12  sjboddie
+   changes for cross-collection searching - still needs work
+
    Revision 1.7  1999/09/21 11:32:42  sjboddie
    added Maxdocs queryfilter option which may be -1 for 'all'
@@ -56 +59 @@
 
 
-// do_query sets the filter options and makes the protocol call to
-// do a query. The results are returned in response. 
-// request.filterResultOptions and request.fields (if required)
-// should be set by the calling function.
-
-bool do_query (FilterRequest_t &request, cgiargsclass &args, 
-           recptproto *collectproto, FilterResponse_t &response, 
-           ostream &logout) {
+// request.filterResultOptions and request.fields (if required) should
+// be set from the calling code
+void set_queryfilter_options (FilterRequest_t &request, const text_t &querystring,
+                  cgiargsclass &args) {
 
   request.filterName = "QueryFilter";
 
-  comerror_t err;
   OptionValue_t option;
-  text_t formattedstring = args["q"];
-  format_querystring (formattedstring, args.getintarg("b"));  
 
   option.name = "Term";
-  option.value = formattedstring;
+  option.value = querystring;
   request.filterOptions.push_back (option);
 
@@ -106 +102 @@
   }
 
+  set_more_queryfilter_options (request, args);
+}
+
+void set_queryfilter_options (FilterRequest_t &request, const text_t &querystring1,
+                  const text_t &querystring2, cgiargsclass &args) {
+
+  set_queryfilter_options (request, querystring1, args);
+
   // fill in the second query if needed
   if (!args["cq2"].empty()) {
+    OptionValue_t option;
+
     option.name = "CombineQuery";
     option.value = args["cq2"];
     request.filterOptions.push_back (option);
     
-    text_t formattedstring2 = args["q2"];
-    format_querystring (formattedstring2, args.getintarg("b"));
-
     option.name = "Term";
-    option.value = formattedstring2;
-    request.filterOptions.push_back (option);
-
+    option.value = querystring2;
+    request.filterOptions.push_back (option);
+    
     option.name = "QueryType";
     option.value = (args.getintarg("t")) ? "ranked" : "boolean";
@@ -149 +152 @@
     }
   }
-
+  set_more_queryfilter_options (request, args);
+}
+
+void set_more_queryfilter_options (FilterRequest_t &request, cgiargsclass &args) {
+
+  OptionValue_t option;
   int arg_m = args.getintarg("m");
-
+  
   option.name = "Maxdocs";
   option.value = arg_m;
   request.filterOptions.push_back (option);
   
-  option.name = "StartResults";
-  option.value = args["r"];
-  request.filterOptions.push_back (option);
-
-  option.name = "EndResults";
-  int endresults = args.getintarg("o") + (args.getintarg("r") - 1);
-  if ((endresults > arg_m) && (arg_m != -1)) endresults = arg_m;
-  option.value = endresults;
-  request.filterOptions.push_back (option);
-
-  collectproto->filter (args["c"], request, response, err, logout);
-
-  if (err != noError) {
-    outconvertclass text_t2ascii;
-    logout << text_t2ascii
-       << "Error: call to QueryFilter failed in queryaction ("
-       << get_comerror_string (err) << ")\n";
-    return false;
-  }
-  return true;
+  //  option.name = "StartResults";
+  //  option.value = args["r"];
+  //  request.filterOptions.push_back (option);
+
+  //  option.name = "EndResults";
+  //  int endresults = args.getintarg("o") + (args.getintarg("r") - 1);
+  //  if ((endresults > arg_m) && (arg_m != -1)) endresults = arg_m;
+  //  option.value = endresults;
+  //  request.filterOptions.push_back (option);
 }