Changeset 1279 for branches/New_Config_Format-branch/gsdl/src/recpt/pageaction.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/pageaction.cpp (modified) (14 diffs)

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

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.29.4.1  2000/07/12 22:21:41  sjboddie
+   merged changes to trunk into New_Config_Format branch
+
+   Revision 1.34  2000/07/12 04:51:05  nzdl
+   added an error message when no "valid" collections are available
+
+   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.
+   Removed all the nzdl.org specific stuff.
+
+   Revision 1.31  2000/06/23 03:48:08  sjboddie
+   Added Arabic language and encoding options to the preferences page. This
+   is a much more complex task than it should be (you even have to recompile!)
+   but it's not really worth fixing until the new config file format is
+   finalised.
+
+   Revision 1.30  2000/06/14 22:33:42  sjboddie
+   Added French and Spanish language selection options to the preferences
+   page. I really don't like how this is currently implemented (i.e. you
+   have to recompile the library to do something so simple), it might have
+   to wait until the new configuration file stuff is done before it's fixed
+   though.
+
    Revision 1.29  2000/03/19 21:16:46  nzdl
    added german language interface
@@ -186 +213 @@
 
   text_t homeextra = "<center><table width=_pagewidth_><tr valign=top>\n";
+  bool found_valid_col = false;
   
   recptprotolistclass::iterator rprotolist_here = protos->begin();
@@ -198 +226 @@
     text_tarray::iterator collist_here = collist.begin();
     text_tarray::iterator collist_end = collist.end();
-    
-    int row1 = 9;
-    int row2 = 8;
-    int count = 1;
+
+    int count = 0;
+    bool first = true;
     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)) {
           
+          found_valid_col = true;
           FilterResponse_t response;
           text_tset metadata;
@@ -233 +260 @@
           }
         
-          if ((count == 1) || (count == (row1+1)) || (count == ((row1+row2)+1))) 
-        homeextra += "<td align=center>";
-          else homeextra += "<p>";
-
-          if (*collist_here == "niupepa") {
-        homeextra += "<a href=\"_httpmusiclibrary_\">_iconmusiclibrary_</a>\n";
-        if ((count == row1) || (count == (row1+row2))) homeextra += "</td>";
-        count ++;
-        if ((count == 1) || (count == (row1+1)) || (count == ((row1+row2)+1))) 
-          homeextra += "<td align=center>";
-        else homeextra += "<p>";
-          }
+          if ((count%3 == 0) && (!first))
+        homeextra += "</tr><tr valign=top>\n";
           
           text_t link = "<a href=\"_gwcgi_?a=p&p=about&c=" + *collist_here + "\">";
@@ -250 +267 @@
         link = "<a href=\"_gwcgi_?a=p&p=about&l=zh&nw=u&c=" + *collist_here + "\">";
           if (*collist_here == "arabic")
-        link = "<a href=\"_gwcgi_?a=p&p=about&w=a&c=" + *collist_here + "\">";
-
-          if (!cinfo.receptionist.empty()) 
-        link = "<a href=\"" + cinfo.receptionist + "\">";
+        link = "<a href=\"_gwcgi_?a=p&p=about&l=ar&nw=u&c=" + *collist_here + "\">";
+
+          if (!cinfo->receptionist.empty()) 
+        link = "<a href=\"" + cinfo->receptionist + "\">";
           
-          homeextra += link + collectionname + "</a>\n";
-          
-          if ((count == row1) || (count == (row1+row2))) 
-        homeextra += "</td>";
+          homeextra += "<td>" + link + collectionname + "</a></td>\n";
           
           count ++;
+          first = false;
         }
       }
@@ -266 +281 @@
       collist_here ++;
     }
-    homeextra += "</tr></table></center>\n";
-    disp.setmacro ("homeextra", "home", homeextra); 
+    for (; count%3 != 0; count ++) homeextra += "<td></td>\n";
       }
     }
     rprotolist_here ++;
   }
+
+  if (!found_valid_col) {
+    homeextra += "<td>No valid (i.e. built and public) collections are available</td>\n";
+  }
+  homeextra += "</tr></table></center>\n";
+  disp.setmacro ("homeextra", "home", homeextra); 
+
 }
 
@@ -319 +340 @@
 
   
+  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);
   }
@@ -340 +367 @@
     // _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"];
     }
 
@@ -369 +395 @@
     // _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_");
 
@@ -376 +402 @@
       // _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");
     }
@@ -392 +418 @@
     text_tarray languages;
     languages.push_back ("en");
+    languages.push_back ("fr");
     languages.push_back ("de");
+    languages.push_back ("es");
     languages.push_back ("mi");
     languages.push_back ("zh");
+    languages.push_back ("ar");
     text_tarray::const_iterator this_lang = languages.begin();
     text_tarray::const_iterator end_lang = languages.end();
 
     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);
@@ -471 +500 @@
           
       // 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_");
@@ -491 +520 @@
 
       // _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;
@@ -500 +529 @@
       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 ++;