Changeset 1270

Timestamp:

2000-07-06T09:49:36+12:00 (24 years ago)

Author:

sjboddie

Message:

Receptionist now caches collection information to avoid making multiple
get_collectinfo calls to collection server

Location:

trunk/gsdl

Files:

• lib/cfgread.cpp (modified) (2 diffs)
• lib/cfgread.h (modified) (1 diff)
• src/recpt/buildaction.cpp (modified) (3 diffs)
• src/recpt/cgiwrapper.cpp (modified) (2 diffs)
• src/recpt/documentaction.cpp (modified) (6 diffs)
• src/recpt/documentaction.h (modified) (1 diff)
• src/recpt/librarymain.cpp (modified) (3 diffs)
• src/recpt/pageaction.cpp (modified) (11 diffs)
• src/recpt/pageaction.h (modified) (1 diff)
• src/recpt/queryaction.cpp (modified) (11 diffs)
• src/recpt/queryaction.h (modified) (3 diffs)
• src/recpt/receptionist.cpp (modified) (5 diffs)
• src/recpt/receptionist.h (modified) (4 diffs)
• src/recpt/statusaction.cpp (modified) (13 diffs)
• src/w32server/settings.h (modified) (1 diff)

trunk/gsdl/lib/cfgread.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.9  2000/07/05 21:49:22  sjboddie
+   Receptionist now caches collection information to avoid making multiple
+   get_collectinfo calls to collection server
+
    Revision 1.8  2000/04/06 19:57:57  cs025
    Correcting a correction - reinstated all lib files due to silly
@@ -56 +60 @@
 
 #include "cfgread.h"
-
-void collectioninfo_t::clear () {
-  gsdl_gsdlhome.clear();
-  gsdl_gdbmhome.clear();
-}
 
 int write_ini_line (ofstream &fileout, const text_t &key, const text_t value) {

trunk/gsdl/lib/cfgread.h

@@ -41 +41 @@
 #endif
 
-struct collectioninfo_t {
-  void clear ();
-  collectioninfo_t () {clear();}
-
-  text_t gsdl_gsdlhome;
-  text_t gsdl_gdbmhome;
-};
-
-typedef map<text_t, collectioninfo_t, lttext_t> colinfo_tmap;
-
 // return 0 on success, -1 on failure
 int write_ini_line (ofstream &fileout, const text_t &key, const text_t value);

trunk/gsdl/src/recpt/buildaction.cpp

@@ -102 +102 @@
   // make sure we know about a receptionist
   if (recpt == NULL) {
-    logout << "The page action does not contain information\n"
+    logout << "The build action does not contain information\n"
            << "about any receptionists. The method set_receptionist\n"
            << "was probably not called from the module which instantiated\n"
-           << "this page action.\n";
+           << "this build action.\n";
     return;
   }
@@ -146 +146 @@
     while (collist_here != collist_end) {
 
-      ColInfoResponse_t cinfo;
-      (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout);
-      if (err == noError) {
+      ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr ((*rprotolist_here).p, *collist_here, logout);
+      if (cinfo != NULL) {
         text_t collectionname = *collist_here;
-        if (!cinfo.collectionmeta["collectionname"].empty())
+        if (!cinfo->collectionmeta["collectionname"].empty())
           {
         // get collection name from the collection cfg file
-        collectionname = cinfo.collectionmeta["collectionname"];
+        collectionname = cinfo->collectionmeta["collectionname"];
           }
         else
@@ -206 +205 @@
             || (args["bc1dirname"]==*collist_here))
           {
-            disp.setmacro("bcargingsdlarea","build",cinfo.building["ingsdlarea"]);
-            disp.setmacro("bcargcopydir","build",cinfo.building["copydir"]);
+            disp.setmacro("bcargingsdlarea","build",cinfo->building["ingsdlarea"]);
+            disp.setmacro("bcargcopydir","build",cinfo->building["copydir"]);
             
-            if (cinfo.buildDate==0) // not built
+            if (cinfo->buildDate==0) // not built
               {
             // assume that's because this is the first build ever for the collection

trunk/gsdl/src/recpt/cgiwrapper.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.30  2000/07/05 21:49:31  sjboddie
+   Receptionist now caches collection information to avoid making multiple
+   get_collectinfo calls to collection server
+
    Revision 1.29  2000/06/29 03:57:14  sjboddie
    Now append to error log (errout.txt) instead of overwriting it each time
@@ -515 +519 @@
       cout << text_t2ascii << outspaces;
 
-      ColInfoResponse_t cinfo;
-      (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, cerr);
-      if (err == noError) {
-        if (cinfo.isPublic) cout << "public ";
+      ColInfoResponse_t *cinfo = recpt.get_collectinfo_ptr ((*rprotolist_here).p, *collist_here, cerr);
+      if (cinfo != NULL) {
+        if (cinfo->isPublic) cout << "public ";
         else cout << "private";
 
-        if (cinfo.buildDate > 0) cout << "   running    ";
+        if (cinfo->buildDate > 0) cout << "   running    ";
         else cout << "   not running";
       }

trunk/gsdl/src/recpt/documentaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.39  2000/07/05 21:49:31  sjboddie
+   Receptionist now caches collection information to avoid making multiple
+   get_collectinfo calls to collection server
+
    Revision 1.38  2000/05/04 05:18:46  sjboddie
    attempting to get end-user collection building to work under windows
@@ -183 +187 @@
 
 documentaction::documentaction () {
+  recpt = NULL;
+
 
   // this action uses cgi variables "a", "d", "cl",
@@ -500 +506 @@
   if (collectproto == NULL) return;
   
+  if (recpt == NULL) {
+    logout << "ERROR (documentaction::define_external_macros): This action does not contain\n"
+       << "      information about any receptionists. The method set_receptionist was\n"
+       << "      probably not called from the module which instantiated this action.\n";
+    return;
+  }
+
   outconvertclass text_t2ascii;
   comerror_t err;
@@ -506 +519 @@
   text_tset metadata;
 
-
-  // get info on current collection and load up formatinfo
-  // I'd prefer not to do this here as we're getting 
-  // collection info every time (and probably also getting
-  // it in other places some of the time) - One day I'll
-  // fix it ... maybe - Stefan.
-  ColInfoResponse_t cinfo;
-  collectproto->get_collectinfo (collection, cinfo, err, logout);
-  load_formatinfo (cinfo.format, args.getintarg("gt"));
+  ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr (collectproto, collection, logout);
+  if (cinfo == NULL) {
+    logout << "ERROR (documentaction::define_external_macros): get_collectinfo_ptr returned NULL\n";
+    return;
+  }
+  load_formatinfo (cinfo->format, args.getintarg("gt"));
 
   if (formatinfo.DocumentUseHTML) {
@@ -526 +536 @@
       disp.setmacro ("gsdltop", "Global", "documenttop");
     }
-    text_tmap::iterator it = cinfo.format.find ("homepage");
-    if (it != cinfo.format.end()) {
+    text_tmap::iterator it = cinfo->format.find ("homepage");
+    if (it != cinfo->format.end()) {
       text_t httppagehome;
       if (get_link (args, protos, (*it).second, httppagehome, logout))
@@ -1101 +1111 @@
   textout << outconvert << disp << buffer;
 }
-
-
-
-
-
-
-
-
-
-
-

trunk/gsdl/src/recpt/documentaction.h

@@ -79 +79 @@
   virtual ~documentaction ();
 
+  void set_receptionist (receptionist *therecpt) {recpt=therecpt;}
+
   text_t get_action_name () {return "d";}
 

trunk/gsdl/src/recpt/librarymain.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.28  2000/07/05 21:49:32  sjboddie
+   Receptionist now caches collection information to avoid making multiple
+   get_collectinfo calls to collection server
+
    Revision 1.27  2000/06/23 03:21:39  sjboddie
    Created converter classes for simple 8 bit encodings that use a
@@ -251 +255 @@
 
   pageaction apageaction;
+  apageaction.set_receptionist (&recpt);
   recpt.add_action (&apageaction);
 
@@ -257 +262 @@
 
   queryaction aqueryaction;
+  aqueryaction.set_receptionist (&recpt);
   recpt.add_action (&aqueryaction);
 
   documentaction adocumentaction;
+  adocumentaction.set_receptionist (&recpt);
   recpt.add_action (&adocumentaction);
 

trunk/gsdl/src/recpt/pageaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.33  2000/07/05 21:49:33  sjboddie
+   Receptionist now caches collection information to avoid making multiple
+   get_collectinfo calls to collection server
+
    Revision 1.32  2000/06/27 23:02:40  sjboddie
    Tidied up the way collections are displayed on 'standard' homepage.
@@ -220 +224 @@
     while (collist_here != collist_end) {
       
-      ColInfoResponse_t cinfo;
-      (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout);
+      ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr ((*rprotolist_here).p, *collist_here, logout);
       
-      if (err == noError) {
-        if (cinfo.isPublic && (cinfo.buildDate > 0)) {
+      if (cinfo != NULL) {
+        if (cinfo->isPublic && (cinfo->buildDate > 0)) {
           
           FilterResponse_t response;
@@ -258 +261 @@
         link = "<a href=\"_gwcgi_?a=p&p=about&l=ar&nw=u&c=" + *collist_here + "\">";
 
-          if (!cinfo.receptionist.empty()) 
-        link = "<a href=\"" + cinfo.receptionist + "\">";
+          if (!cinfo->receptionist.empty()) 
+        link = "<a href=\"" + cinfo->receptionist + "\">";
           
           homeextra += "<td>" + link + collectionname + "</a></td>\n";
@@ -324 +327 @@
 
   
+  if (recpt == NULL) {
+    logout << "ERROR (pageaction::define_internal_macros): This action does not contain\n"
+       << "      information about any receptionists. The method set_receptionist was\n"
+       << "      probably not called from the module which instantiated this action.\n";
+    return;
+  }
+
   text_t &arg_p = args["p"];
   text_t &arg_c = args["c"];
-  ColInfoResponse_t cinfo;
-  comerror_t err;
+  ColInfoResponse_t *cinfo = NULL;
 
   recptproto* collectproto = protos->getrecptproto (arg_c, logout);
   if (collectproto != NULL) {
-    collectproto->get_collectinfo (arg_c, cinfo, err, logout);
-
-    disp.setmacro ("numdocs", "Global", cinfo.numDocs);
+    cinfo = recpt->get_collectinfo_ptr (collectproto, arg_c, logout);
+
+    disp.setmacro ("numdocs", "Global", cinfo->numDocs);
     unsigned long current_time = time(NULL);
-    unsigned long builddate = (current_time - cinfo.buildDate) / 86400;
+    unsigned long builddate = (current_time - cinfo->buildDate) / 86400;
     disp.setmacro ("builddate", "Global", builddate);
   }
@@ -345 +354 @@
     // _collectionoption_
 
-    if (args["ccs"] == "1" && collectproto != NULL && (cinfo.ccsCols.size() > 1)) {
+    if (args["ccs"] == "1" && collectproto != NULL && (cinfo->ccsCols.size() > 1)) {
       text_t collectionoption = "_textcollectionoption_";
-      text_tarray::const_iterator col_here = cinfo.ccsCols.begin();
-      text_tarray::const_iterator col_end = cinfo.ccsCols.end();
+      text_tarray::const_iterator col_here = cinfo->ccsCols.begin();
+      text_tarray::const_iterator col_end = cinfo->ccsCols.end();
       int count = 0;
       while (col_here != col_end) {
     text_t colname;
     if (*col_here == arg_c) {
-        colname = cinfo.collectionmeta["collectionname"];
+        colname = cinfo->collectionmeta["collectionname"];
     } else {
-      ColInfoResponse_t this_cinfo;
-      collectproto->get_collectinfo (*col_here, this_cinfo, err, logout);
-      if (err != noError) {col_here ++; continue;}
-      colname = this_cinfo.collectionmeta["collectionname"];
+      ColInfoResponse_t *this_cinfo = recpt->get_collectinfo_ptr (collectproto, *col_here, logout);
+      if (this_cinfo == NULL) {col_here ++; continue;}
+      colname = this_cinfo->collectionmeta["collectionname"];
     }
 
@@ -374 +382 @@
     // _htmloptions_
     
-    text_tmap::const_iterator it = cinfo.format.find ("DocumentUseHTML");
-    if ((it != cinfo.format.end()) && ((*it).second == "true")) {
+    text_tmap::const_iterator it = cinfo->format.find ("DocumentUseHTML");
+    if ((it != cinfo->format.end()) && ((*it).second == "true")) {
       disp.setmacro ("htmloptions", "preferences", "_htmloptionson_");
 
@@ -381 +389 @@
       // _PreferenceDocsFromWeb_
 
-      it = cinfo.format.find ("PreferenceDocsFromWeb");
-      if ((it == cinfo.format.end()) || ((*it).second == "true"))
+      it = cinfo->format.find ("PreferenceDocsFromWeb");
+      if ((it == cinfo->format.end()) || ((*it).second == "true"))
     disp.setmacro ("PreferenceDocsFromWeb", "preferences", "1");
     }
@@ -407 +415 @@
 
     text_t languageoption = "_textlanguage_\n<select name=\"l\" onChange=\"updatel();\">\n";
-    it = cinfo.format.find ("PreferenceLanguages");
-    if ((it != cinfo.format.end()) && (!(*it).second.empty())) {
+    it = cinfo->format.find ("PreferenceLanguages");
+    if ((it != cinfo->format.end()) && (!(*it).second.empty())) {
       text_tset pref_langs;
       splitchar ((*it).second.begin(), (*it).second.end(), '|', pref_langs);
@@ -479 +487 @@
           
       // if HTML collection there's no how to read document text
-      text_tmap::const_iterator it = cinfo.format.find ("HelpNoDocs");
-      if ((it != cinfo.format.end()) && ((*it).second == "true")) {
+      text_tmap::const_iterator it = cinfo->format.find ("HelpNoDocs");
+      if ((it != cinfo->format.end()) && ((*it).second == "true")) {
     disp.setmacro ("topicreadingdocs", "help", "");
     disp.setmacro ("texthelpreadingdocs", "help", "");
       }
-      it = cinfo.format.find ("HelpBibDocs");
-      if ((it != cinfo.format.end()) && ((*it).second == "true")) {
+      it = cinfo->format.find ("HelpBibDocs");
+      if ((it != cinfo->format.end()) && ((*it).second == "true")) {
     disp.setmacro ("texthelpreadingdocs", "help", "_bibtexthelpreadingdocs_");
     disp.setmacro ("textreadingdocs", "help", "_bibtextreadingdocs_");
       }
-      it = cinfo.format.find ("HelpBookDocs");
-      if ((it != cinfo.format.end()) && ((*it).second == "true")) {
+      it = cinfo->format.find ("HelpBookDocs");
+      if ((it != cinfo->format.end()) && ((*it).second == "true")) {
     disp.setmacro ("texthelpreadingdocs", "help", "_booktexthelpreadingdocs_");
     disp.setmacro ("textreadingdocs", "help", "_booktextreadingdocs_");
@@ -499 +507 @@
 
       // _textsubcollections_
-      if (args["ccs"] == "1" && (cinfo.ccsCols.size() > 1)) {
-    text_t textsubcollections = "_textsubcols1_(" + text_t(cinfo.ccsCols.size()) + ")";
-    text_tarray::const_iterator here = cinfo.ccsCols.begin();
-    text_tarray::const_iterator end = cinfo.ccsCols.end();
+      if (args["ccs"] == "1" && (cinfo->ccsCols.size() > 1)) {
+    text_t textsubcollections = "_textsubcols1_(" + text_t(cinfo->ccsCols.size()) + ")";
+    text_tarray::const_iterator here = cinfo->ccsCols.begin();
+    text_tarray::const_iterator end = cinfo->ccsCols.end();
     bool first = true;
     int count = 0;
@@ -508 +516 @@
       if (*here == arg_c) {
         if (!first) textsubcollections += "<br>";
-        textsubcollections += "\n" + cinfo.collectionmeta["collectionname"] + "\n";
+        textsubcollections += "\n" + cinfo->collectionmeta["collectionname"] + "\n";
       } else {
-        ColInfoResponse_t this_cinfo;
-        collectproto->get_collectinfo (*here, this_cinfo, err, logout);
-        if (err != noError) {here ++; continue;}
+        ColInfoResponse_t *this_cinfo = recpt->get_collectinfo_ptr (collectproto, *here, logout);
+        if (this_cinfo == NULL) {here ++; continue;}
         if (!first) textsubcollections += "<br>";
-        textsubcollections += "\n" + this_cinfo.collectionmeta["collectionname"] + "\n";
+        textsubcollections += "\n" + this_cinfo->collectionmeta["collectionname"] + "\n";
       }
       count ++;

trunk/gsdl/src/recpt/pageaction.h

@@ -47 +47 @@
   virtual ~pageaction ();
 
+  void set_receptionist (receptionist *therecpt) {recpt=therecpt;}
+
   text_t get_action_name () {return "p";}
 

trunk/gsdl/src/recpt/queryaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   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 +181 @@
 queryaction::queryaction () {
 
+  recpt = NULL;
   num_phrases = 0;
 
@@ -695 +700 @@
                   ostream &textout, ostream &logout) {
 
-  ColInfoResponse_t cinfo;
+  ColInfoResponse_t *cinfo = NULL;
   comerror_t err;
   InfoFilterOptionsResponse_t fresponse;
@@ -737 +742 @@
     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 +794 @@
               << " 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 +821 @@
                  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 +879 @@
   map<text_t, colinfo_t, lttext_t> colinfomap;
 
-  ColInfoResponse_t cinfo;
+  ColInfoResponse_t *cinfo = NULL;
   comerror_t err;
   FilterRequest_t request;
@@ -906 +919 @@
       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 +931 @@
     text_t formatstring;
     if (!get_formatstring (classification, browsertype, 
-               cinfo.format, formatstring))
+               cinfo->format, formatstring))
       formatstring = bptr->get_default_formatstring();
 
@@ -1069 +1087 @@
   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 +1100 @@
   text_t formatstring;
   if (!get_formatstring (classification, browsertype, 
-             cinfo.format, formatstring))
+             cinfo->format, formatstring))
     formatstring = bptr->get_default_formatstring();
 

trunk/gsdl/src/recpt/queryaction.h

@@ -32 +32 @@
 #include "gsdlconf.h"
 #include "action.h"
+#include "receptionist.h"
 
 struct colinfo_t {
@@ -61 +62 @@
 
 protected:
+
+  receptionist *recpt;
+
   text_t formatstring;
   int num_phrases;
@@ -97 +101 @@
   queryaction ();
   virtual ~queryaction () {}
+
+  void set_receptionist (receptionist *therecpt) {recpt=therecpt;}
   
   void configure (const text_t &key, const text_tarray &cfgline);

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.53  2000/07/05 21:49:34  sjboddie
+   Receptionist now caches collection information to avoid making multiple
+   get_collectinfo calls to collection server
+
    Revision 1.52  2000/07/04 02:15:22  sjboddie
    fixed bug causing segmentation fault when an invalid collection
@@ -286 +290 @@
 }
 
-
+void collectioninfo_t::clear () {
+  gsdl_gsdlhome.clear();
+  gsdl_gdbmhome.clear();
+
+  info_loaded = false;
+  info.clear();
+}
 
 receptionist::receptionist () {
@@ -1034 +1044 @@
   colinfo_tmap::iterator colend = configinfo.collectinfo.end();
   while (colhere != colend) {
-    gsdlmacrodir = filename_cat ((*colhere).second.gsdl_gsdlhome, "macros");
-    maindirs.insert (gsdlmacrodir);
+    if (!((*colhere).second.gsdl_gsdlhome).empty()) {
+      gsdlmacrodir = filename_cat ((*colhere).second.gsdl_gsdlhome, "macros");
+      maindirs.insert (gsdlmacrodir);
+    }
     colhere ++;
   }
@@ -1126 +1138 @@
 
     } else {
-      ColInfoResponse_t cinfo;
-      comerror_t err;
-
-      collectproto->get_collectinfo (arg_c, cinfo, err, logout);
-
-      if (!cinfo.ccsCols.empty()) {
-    args["ccs"] = 1;
-    if (args["cc"].empty()) {
-      text_tarray::const_iterator col_here = cinfo.ccsCols.begin();
-      text_tarray::const_iterator col_end = cinfo.ccsCols.end();
-      bool first = true;
-      while (col_here != col_end) {
-        // make sure it's a valid collection
-        if (protocols.getrecptproto (*col_here, logout) != NULL) {
-          if (!first) args["cc"].push_back (',');
-          args["cc"] += *col_here;
-          first = false;
+
+      ColInfoResponse_t *cinfo = get_collectinfo_ptr (collectproto, arg_c, logout);
+
+      if (cinfo != NULL) {
+    if (!cinfo->ccsCols.empty()) {
+      args["ccs"] = 1;
+      if (args["cc"].empty()) {
+        text_tarray::const_iterator col_here = cinfo->ccsCols.begin();
+        text_tarray::const_iterator col_end = cinfo->ccsCols.end();
+        bool first = true;
+        while (col_here != col_end) {
+          // make sure it's a valid collection
+          if (protocols.getrecptproto (*col_here, logout) != NULL) {
+        if (!first) args["cc"].push_back (',');
+        args["cc"] += *col_here;
+        first = false;
+          }
+          col_here ++;
         }
-        col_here ++;
       }
     }
+      } else {
+    logout << "ERROR (receptionist::check_mainargs): get_collectinfo_ptr returned NULL\n";
       }
     }
@@ -1331 +1345 @@
   }
 }
+
+// gets collection info from cache if found or 
+// calls collection server (and updates cache)
+// returns NULL if there's an error
+ColInfoResponse_t *receptionist::get_collectinfo_ptr (recptproto *collectproto, 
+                              const text_t &collection, 
+                              ostream &logout) {
+  
+  // check the cache
+  colinfo_tmap::iterator it = configinfo.collectinfo.find (collection);
+  if ((it != configinfo.collectinfo.end()) && ((*it).second.info_loaded)) {
+    // found it
+    return &((*it).second.info);
+  }
+
+  // not cached, get info from collection server
+  if (collectproto == NULL) {
+    logout << "ERROR: receptionist::get_collectinfo_ptr passed null collectproto\n";
+    return NULL;
+  }
+   
+  comerror_t err;
+  if (it == configinfo.collectinfo.end()) {
+    collectioninfo_t cinfo;
+    collectproto->get_collectinfo (collection, cinfo.info, err, logout);
+    if (err != noError) {
+      outconvertclass text_t2ascii;
+      logout << text_t2ascii << "ERROR (receptionist::getcollectinfo_ptr): \""
+         << get_comerror_string (err) << "\"while getting collectinfo\n";
+      return NULL;
+    }
+    cinfo.info_loaded = true;
+    configinfo.collectinfo[collection] = cinfo;
+    return &(configinfo.collectinfo[collection].info);
+  } else {
+    collectproto->get_collectinfo (collection, (*it).second.info, err, logout);
+    if (err != noError) {
+      outconvertclass text_t2ascii;
+      logout << text_t2ascii << "ERROR (receptionist::getcollectinfo_ptr): \""
+         << get_comerror_string (err) << "\"while getting collectinfo\n";
+      return NULL;
+    }
+    (*it).second.info_loaded = true;
+    return &((*it).second.info);
+  }
+}

trunk/gsdl/src/recpt/receptionist.h

@@ -34 +34 @@
 #include "cgiargs.h"
 #include "display.h"
-#include "action.h"
 #include "browserclass.h"
 #include "recptproto.h"
 #include "converter.h"
 #include "cfgread.h"
+#include "action.h"
 
 // the MACROPRECEDENCE macro is used as a default. override
@@ -49 +49 @@
 #define MACROPRECEDENCE "c,l"
 #endif
+
+
+struct collectioninfo_t {
+  void clear ();
+  collectioninfo_t () {clear();}
+
+  text_t gsdl_gsdlhome;
+  text_t gsdl_gdbmhome;
+
+  bool info_loaded;
+  ColInfoResponse_t info;
+};
+
+typedef map<text_t, collectioninfo_t, lttext_t> colinfo_tmap;
 
 
@@ -72 +86 @@
 };
 
-
 class receptionist {
 protected:
@@ -196 +209 @@
   // list. This can be used to save preferences between sessions.
   text_t get_compressed_arg (cgiargsclass &args, ostream &logout);
+
+  // gets collection info from cache if found or 
+  // calls collection server (and updates cache)
+  // returns NULL if there's an error
+  ColInfoResponse_t *get_collectinfo_ptr (recptproto *collectproto, 
+                      const text_t &collection, 
+                      ostream &logout);
+
   
 protected:

trunk/gsdl/src/recpt/statusaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.31  2000/07/05 21:49:36  sjboddie
+   Receptionist now caches collection information to avoid making multiple
+   get_collectinfo calls to collection server
+
    Revision 1.30  2000/07/03 22:26:27  nzdl
    fixed a few errors in the macro files (and one in some text printed out
@@ -157 +161 @@
                    displayclass &disp, outconvertclass &outconvert, 
                    ostream &textout, ostream &logout) {
+
+  if (recpt == NULL) return;
 
   textout << outconvert << disp 
@@ -188 +194 @@
             << "</a></td>";
 
-      ColInfoResponse_t cinfo;
-      (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout);
-      if (err == noError) {
+      ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr ((*rprotolist_here).p, *collist_here, logout);
+      if (cinfo != NULL) {
         text_t collname = *collist_here;
-        text_tmap::iterator it = cinfo.collectionmeta.find("collectionname");
-        if (it != cinfo.collectionmeta.end()) collname = (*it).second;
+        text_tmap::iterator it = cinfo->collectionmeta.find("collectionname");
+        if (it != cinfo->collectionmeta.end()) collname = (*it).second;
 
         textout << "<td>";
-        if (cinfo.buildDate > 0)
+        if (cinfo->buildDate > 0)
           textout << outconvert << disp 
               << "<a href=\"_httppagex_(about)&c=" << *collist_here
@@ -203 +208 @@
         textout << outconvert << disp << collname;
 
-        if (cinfo.buildDate > 0) textout << "</a>";
+        if (cinfo->buildDate > 0) textout << "</a>";
 
         textout << "</td>";
 
-        if (cinfo.isPublic) textout << "<td>yes</td>";
+        if (cinfo->isPublic) textout << "<td>yes</td>";
         else textout << "<td>no</td>";
         
-        if (cinfo.buildDate > 0)
+        if (cinfo->buildDate > 0)
           textout << outconvert << "<td>yes</td>";
         else
@@ -651 +656 @@
   } else {
     // rproto can't be NULL to get here
-    ColInfoResponse_t collectinfo;
-    comerror_t err;
-
-    rproto->get_collectinfo (arg_c, collectinfo, err, logout);
-    if (err == noError) {
+    ColInfoResponse_t *collectinfo = recpt->get_collectinfo_ptr (rproto, arg_c, logout);
+    if (collectinfo != NULL) {
       textout << outconvert << "<table>\n"
           << "<tr><th>collection name</th><td>\""
-          << collectinfo.shortInfo.name
+          << collectinfo->shortInfo.name
           << "\"</td></tr>\n"
 
           << "<tr><th>host</th><td>\""
-          << collectinfo.shortInfo.host
+          << collectinfo->shortInfo.host
           << "\"</td></tr>\n"
 
           << "<tr><th>port</th><td>\""
-          << collectinfo.shortInfo.port
+          << collectinfo->shortInfo.port
           << "\"</td></tr>\n"
 
           << "<tr><th>is public?</th><td>";
-      if (collectinfo.isPublic) textout << outconvert << "true";
+      if (collectinfo->isPublic) textout << outconvert << "true";
       else textout << outconvert << "false";
       textout << outconvert 
@@ -676 +678 @@
 
           << "<tr><th>is beta?</th><td>";
-      if (collectinfo.isBeta) textout << outconvert << "true";
+      if (collectinfo->isBeta) textout << outconvert << "true";
       else textout << outconvert << "false";
       textout << outconvert 
@@ -682 +684 @@
 
           << "<tr><th>build date</th><td>\""
-          << collectinfo.buildDate
+          << collectinfo->buildDate
           << "\"</td></tr>\n"
 
           << "<tr><th>interface languages</th><td>";
-      text_tarray::iterator languages_here = collectinfo.languages.begin();
-      text_tarray::iterator languages_end = collectinfo.languages.end();
+      text_tarray::iterator languages_here = collectinfo->languages.begin();
+      text_tarray::iterator languages_end = collectinfo->languages.end();
       bool languages_first = true;
       while (languages_here != languages_end) {
@@ -697 +699 @@
 
       textout << "<tr><th valign=top>collection metadata</th><td><table>\n";
-      text_tmap::iterator meta_here = collectinfo.collectionmeta.begin();
-      text_tmap::iterator meta_end = collectinfo.collectionmeta.end();
+      text_tmap::iterator meta_here = collectinfo->collectionmeta.begin();
+      text_tmap::iterator meta_end = collectinfo->collectionmeta.end();
       while (meta_here != meta_end) {
     textout << outconvert << "<tr><td>" << (*meta_here).first
@@ -707 +709 @@
 
       textout << "<tr><th valign=top>format info</th><td><table>\n";
-      text_tmap::iterator format_here = collectinfo.format.begin();
-      text_tmap::iterator format_end = collectinfo.format.end();
+      text_tmap::iterator format_here = collectinfo->format.begin();
+      text_tmap::iterator format_end = collectinfo->format.end();
       while (format_here != format_end) {
     textout << outconvert << "<tr><td>" << (*format_here).first
@@ -717 +719 @@
 
       textout << "<tr><th valign=top>building info</th><td><table>\n";
-      text_tmap::iterator building_here = collectinfo.building.begin();
-      text_tmap::iterator building_end = collectinfo.building.end();
+      text_tmap::iterator building_here = collectinfo->building.begin();
+      text_tmap::iterator building_end = collectinfo->building.end();
       while (building_here != building_end) {
     textout << outconvert << "<tr><td>" << (*building_here).first
@@ -730 +732 @@
 
           << "<tr><th>number of documents</th><td>\""
-          << collectinfo.numDocs
+          << collectinfo->numDocs
           << "\"</td></tr>\n"
 
           << "<tr><th>number of sections</th><td>\""
-          << collectinfo.numSections
+          << collectinfo->numSections
           << "\"</td></tr>\n"
 
           << "<tr><th>number of words</th><td>\""
-          << collectinfo.numWords
+          << collectinfo->numWords
           << "\"</td></tr>\n"
 
           << "<tr><th>number of bytes</th><td>\""
-          << collectinfo.numBytes
+          << collectinfo->numBytes
           << "\"</td></tr>\n"
 
           << "<tr><th>preferred receptionist</th><td>\""
-          << collectinfo.receptionist
+          << collectinfo->receptionist
           << "\"</td></tr>\n"
 
@@ -752 +754 @@
       
     } else {
-      textout << outconvert << "Error (" << get_comerror_string (err) 
-          << ") while getting collect information\n";
+      textout << "ERROR (statusaction::output_collectioninfo): while getting collect information\n";
     }
 
@@ -760 +761 @@
     InfoFilterOptionsRequest_t filteroptions_request;
     InfoFilterOptionsResponse_t filteroptions;
+    comerror_t err;
     rproto->get_filterinfo (arg_c, filterinfo, err, logout);
     if (err == noError) {

trunk/gsdl/src/w32server/settings.h

@@ -12 +12 @@
 #include "text_t.h"
 #include "cfgread.h"
+#include "receptionist.h"
 
 // library settings