Changeset 421 for trunk/gsdl/src/recpt/queryaction.cpp

Timestamp:

1999-07-30T14:24:45+12:00 (25 years ago)

Author:

sjboddie

Message:

added collectinfo argument to some functions

File:

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

trunk/gsdl/src/recpt/queryaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.17  1999/07/30 02:24:42  sjboddie
+   added collectinfo argument to some functions
+
    Revision 1.16  1999/07/19 00:16:58  sjboddie
    no longer display documents that don't match all phrases in query string
@@ -297 +300 @@
 }
 
-void queryaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
-                      recptproto */*collectproto*/, ostream &/*logout*/) {
+void queryaction::define_internal_macros (const ColInfoResponse_t &/*collectinfo*/, displayclass &disp, 
+                      cgiargsclass &args, recptproto */*collectproto*/, 
+                      ostream &/*logout*/) {
 
   // define_internal_macros sets the following macros:
@@ -374 +378 @@
 }
 
-void queryaction::define_external_macros (displayclass &disp, cgiargsclass &args, 
-                      recptproto *collectproto, ostream &logout) {
+void queryaction::define_external_macros (const ColInfoResponse_t &/*collectinfo*/, displayclass &disp, 
+                      cgiargsclass &args, recptproto *collectproto, 
+                      ostream &logout) {
 
   // define_external_macros sets the following macros:
@@ -421 +426 @@
 }
 
-bool queryaction::do_action (cgiargsclass &args, recptproto *collectproto,
-                 displayclass &disp, outconvertclass &outconvert, 
-                 ostream &textout, ostream &logout) {
-
-  // if we have no format string see if the collection server has one
+bool queryaction::do_action (cgiargsclass &args, const ColInfoResponse_t &collectinfo, 
+                 recptproto *collectproto, displayclass &disp, 
+                 outconvertclass &outconvert, ostream &textout, 
+                 ostream &logout) {
+
   if (formatstring.empty()) {
-    ColInfoResponse_t collectinfo;
-    comerror_t err;
-    collectproto->get_collectinfo (args["c"], collectinfo, err, logout);
-    if (err == noError) {
-      text_tmap::const_iterator result = collectinfo.format.find("result");
-      if (result != collectinfo.format.end())
-    formatstring = (*result).second;
-    }
-  }
+    text_tmap::const_iterator result = collectinfo.format.find("result");
+    if (result != collectinfo.format.end())
+      formatstring = (*result).second;
+  }
+
   // if we still don't have a format string use the default
   if (formatstring.empty())