Changeset 1270 for trunk/gsdl/src/recpt/pageaction.cpp

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

File:

• trunk/gsdl/src/recpt/pageaction.cpp (modified) (11 diffs)

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