Changeset 1279 for branches/New_Config_Format-branch/gsdl/src/recpt/queryaction.cpp

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

File:

• branches/New_Config_Format-branch/gsdl/src/recpt/queryaction.cpp (modified) (11 diffs)

branches/New_Config_Format-branch/gsdl/src/recpt/queryaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.36.4.1  2000/07/12 22:21:43  sjboddie
+   merged changes to trunk into New_Config_Format branch
+
+   Revision 1.37  2000/07/05 21:49:34  sjboddie
+   Receptionist now caches collection information to avoid making multiple
+   get_collectinfo calls to collection server
+
    Revision 1.36  2000/02/21 21:57:48  sjboddie
    actions are now configured with gsdlhome
@@ -177 +184 @@
 queryaction::queryaction () {
 
+  recpt = NULL;
   num_phrases = 0;
 
@@ -695 +703 @@
                   ostream &textout, ostream &logout) {
 
-  ColInfoResponse_t cinfo;
+  ColInfoResponse_t *cinfo = NULL;
   comerror_t err;
   InfoFilterOptionsResponse_t fresponse;
@@ -737 +745 @@
     while (collist_here != collist_end) {
       
-      (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout);
+      cinfo = recpt->get_collectinfo_ptr ((*rprotolist_here).p, *collist_here, logout);
       //      if (err == noError && cinfo.isPublic && (cinfo.buildDate > 0)) {
-      if (err == noError && (cinfo.buildDate > 0)) {
+      if (cinfo != NULL && (cinfo->buildDate > 0)) {
         
         (*rprotolist_here).p->get_filteroptions (*collist_here, frequest, fresponse, err, logout);
@@ -789 +797 @@
               << " name=cc value=\"" << *collist_here << "\">";
           
-          if (!cinfo.collectionmeta["collectionname"].empty())
-        textout << outconvert << disp << cinfo.collectionmeta["collectionname"];
+          if (!cinfo->collectionmeta["collectionname"].empty())
+        textout << outconvert << disp << cinfo->collectionmeta["collectionname"];
           else 
         textout << outconvert << *collist_here;
@@ -816 +824 @@
                  ostream &logout) {
   
+  if (recpt == NULL) {
+    logout << "ERROR (queryaction::do_action): This action does not contain information\n"
+       << "      about any receptionists. The method set_receptionist was probably\n"
+       << "      not called from the module which instantiated this action.\n";
+    return true;
+  }
+
+
   if (args["ccs"] == "1") {
     if (!args["cc"].empty()) {
@@ -866 +882 @@
   map<text_t, colinfo_t, lttext_t> colinfomap;
 
-  ColInfoResponse_t cinfo;
+  ColInfoResponse_t *cinfo = NULL;
   comerror_t err;
   FilterRequest_t request;
@@ -906 +922 @@
       continue;
     }
-    collectproto->get_collectinfo (*col_here, cinfo, err, logout);
+    cinfo = recpt->get_collectinfo_ptr (collectproto, *col_here, logout);
+    if (cinfo == NULL) {
+      logout << "ERROR (query_action::search_multiple_collections): get_collectinfo_ptr returned NULL\n";
+      col_here ++;
+      continue;
+    }
     
     browserclass *bptr = browsers->getbrowser (browsertype);
@@ -913 +934 @@
     text_t formatstring;
     if (!get_formatstring (classification, browsertype, 
-               cinfo.format, formatstring))
+               cinfo->format, formatstring))
       formatstring = bptr->get_default_formatstring();
 
@@ -1069 +1090 @@
   text_t classification = "Search";
 
-  ColInfoResponse_t cinfo;
   comerror_t err;
-  collectproto->get_collectinfo (collection, cinfo, err, logout);
+  ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr (collectproto, collection, logout);
+
+  if (cinfo == NULL) {
+    logout << "ERROR (query_action::search_single_collection): get_collectinfo_ptr returned NULL\n";
+    return false;
+  }
     
   browserclass *bptr = browsers->getbrowser (browsertype);
@@ -1078 +1103 @@
   text_t formatstring;
   if (!get_formatstring (classification, browsertype, 
-             cinfo.format, formatstring))
+             cinfo->format, formatstring))
     formatstring = bptr->get_default_formatstring();