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

Timestamp:

1999-11-02T10:58:02+13:00 (25 years ago)

Author:

sjboddie

Message:

changes to arguments of many functions, now pass list of protocols
instead of just that for this collection

File:

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

trunk/gsdl/src/recpt/pageaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.20  1999/11/01 21:58:02  sjboddie
+   changes to arguments of many functions, now pass list of protocols
+   instead of just that for this collection
+
    Revision 1.19  1999/10/19 21:59:09  sjboddie
    bug in generating "how to find information" text for about pages
@@ -142 +146 @@
 }
 
-void pageaction::get_cgihead_info (cgiargsclass &/*args*/, response_t &response,
-                   text_t &response_data, ostream &/*logout*/) {
+void pageaction::get_cgihead_info (cgiargsclass &/*args*/, recptprotolistclass * /*protos*/,
+                   response_t &response,text_t &response_data, 
+                   ostream &/*logout*/) {
   response = content;
   response_data = "text/html";
 }
 
-void pageaction::define_internal_macros (const ColInfoResponse_t &collectinfo, displayclass &disp, 
-                     cgiargsclass &args, recptproto *collectproto, 
-                     ostream &logout) {
+void pageaction::set_homeextra_macro (displayclass &disp, recptprotolistclass *protos, 
+                      ostream &logout) {
+
+  text_t homeextra = "<center><table width=_pagewidth_><tr valign=top>\n";
+  
+  recptprotolistclass::iterator rprotolist_here = protos->begin();
+  recptprotolistclass::iterator rprotolist_end = protos->end();
+  while (rprotolist_here != rprotolist_end) {
+    if ((*rprotolist_here).p != NULL) {
+
+      text_tarray collist;
+      comerror_t err;
+      (*rprotolist_here).p->get_collection_list (collist, err, logout);
+      if (err == noError) {
+    text_tarray::iterator collist_here = collist.begin();
+    text_tarray::iterator collist_end = collist.end();
+    
+    int row1 = 6;
+    int row2 = 4;
+    int count = 1;
+    while (collist_here != collist_end) {
+
+      if (*collist_here == "niupepa")
+        homeextra += "<p><a href=\"_httpmusiclibrary_\">_iconmusiclibrary_</a>\n";
+      
+      ColInfoResponse_t cinfo;
+      (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout);
+      
+      if (err == noError) {
+        if (cinfo.isPublic && (cinfo.buildDate > 0)) {
+          
+          FilterResponse_t response;
+          text_tset metadata;
+          metadata.insert ("collectionname");
+          metadata.insert ("iconcollection");
+          metadata.insert ("iconcollectionsmall");
+          text_t collectionname = *collist_here;
+          text_t alt = collectionname;
+          if (get_info ("collection", *collist_here, metadata, false, 
+                (*rprotolist_here).p, response, logout)) {
+        if (!response.docInfo[0].metadata["collectionname"].values[0].empty())
+          alt = response.docInfo[0].metadata["collectionname"].values[0];
+        
+        if (!response.docInfo[0].metadata["iconcollectionsmall"].values[0].empty())
+            collectionname = "<img width=150 border=1 src=\""
+              + response.docInfo[0].metadata["iconcollectionsmall"].values[0]
+              + "\" alt=\"" + alt + "\">";
+        else if (!response.docInfo[0].metadata["iconcollection"].values[0].empty())
+          collectionname = "<img width=150 border=1 src=\""
+            + response.docInfo[0].metadata["iconcollection"].values[0]
+            + "\" alt=\"" + alt + "\">";
+        else collectionname = alt;
+          }
+        
+          if ((count == 1) || (count == (row1+1)) || (count == ((row1+row2)+1))) 
+        homeextra += "<td align=center>";
+          else homeextra += "<p>";
+          text_t link = "<a href=\"_gwcgi_?a=p&p=about&c=" + *collist_here + "\">";
+          if (*collist_here == "chinese")
+        link = "<a href=\"_gwcgi_?a=p&p=about&l=zh&nw=u&c=" + *collist_here + "\">";
+
+          if (!cinfo.receptionist.empty()) 
+        link = "<a href=\"" + cinfo.receptionist + "?a=p&p=about&c=" 
+          + *collist_here + "\">";
+          
+          homeextra += link + collectionname + "</a>\n";
+          
+          if ((count == row1) || (count == (row1+row2))) 
+        homeextra += "</td>";
+          
+          count ++;
+        }
+      }
+      
+      collist_here ++;
+    }
+    homeextra += "</tr></table></center>\n";
+    disp.setmacro ("homeextra", "home", homeextra); 
+      }
+    }
+    rprotolist_here ++;
+  }
+}
+
+void pageaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
+                     recptprotolistclass *protos, ostream &logout) {
 
   // define_internal_macros sets the following macros:
@@ -177 +265 @@
   text_t &arg_p = args["p"];
 
-  if (arg_p == "home") {
-    // make sure we know about a receptionist
-    if (recpt == NULL) {
-      logout << "The page 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";
-      return;
+  if (arg_p == "home") set_homeextra_macro (disp, protos, logout);
+
+  else if (arg_p == "about" || arg_p == "help") {
+    // get pointer to collection server
+    recptproto* collectproto = protos->getrecptproto (args["c"], logout);
+    if (collectproto == NULL) return;
+    
+    if (arg_p == "about") {
+      comerror_t err;
+      ColInfoResponse_t cinfo;
+      collectproto->get_collectinfo (args["c"], cinfo, err, logout);
+
+      disp.setmacro ("numdocs", "about", cinfo.numDocs);
+      unsigned long current_time = time(NULL);
+      unsigned long builddate = (current_time - cinfo.buildDate) / 86400;
+      disp.setmacro ("builddate", "about", builddate);
     }
-
-    text_t homeextra = "<center><table width=_pagewidth_><tr valign=top>\n";
-
-    recptprotolistclass *rprotolist = recpt->get_recptprotolist_ptr ();
-    if (rprotolist == NULL) return;
-
-    recptprotolistclass::iterator rprotolist_here = rprotolist->begin();
-    recptprotolistclass::iterator rprotolist_end = rprotolist->end();
-    while (rprotolist_here != rprotolist_end) {
-      if ((*rprotolist_here).p != NULL) {
-
-    text_tarray collist;
-    comerror_t err;
-    (*rprotolist_here).p->get_collection_list (collist, err, logout);
-    if (err == noError) {
-      text_tarray::iterator collist_here = collist.begin();
-      text_tarray::iterator collist_end = collist.end();
-
-      int row1 = 6;
-      int row2 = 4;
-      int count = 1;
-      while (collist_here != collist_end) {
-
-        if (*collist_here == "niupepa")
-          homeextra += "<p><a href=\"_httpmusiclibrary_\">_iconmusiclibrary_</a>\n";
-
-
-        ColInfoResponse_t cinfo;
-        (*rprotolist_here).p->get_collectinfo (*collist_here, cinfo, err, logout);
-
-        if (err == noError) {
-          if (cinfo.isPublic && (cinfo.buildDate > 0)) {
-
-        FilterResponse_t response;
-        text_tset metadata;
-        metadata.insert ("collectionname");
-        metadata.insert ("iconcollection");
-        metadata.insert ("iconcollectionsmall");
-        text_t collectionname = *collist_here;
-        text_t alt = collectionname;
-        if (get_info ("collection", *collist_here, metadata, false, 
-                  (*rprotolist_here).p, response, logout)) {
-          if (!response.docInfo[0].metadata["collectionname"].values[0].empty())
-            alt = response.docInfo[0].metadata["collectionname"].values[0];
-          
-          if (!response.docInfo[0].metadata["iconcollectionsmall"].values[0].empty())
-            collectionname = "<img width=150 border=1 src=\""
-              + response.docInfo[0].metadata["iconcollectionsmall"].values[0]
-              + "\" alt=\"" + alt + "\">";
-          else if (!response.docInfo[0].metadata["iconcollection"].values[0].empty())
-            collectionname = "<img width=150 border=1 src=\""
-              + response.docInfo[0].metadata["iconcollection"].values[0]
-              + "\" alt=\"" + alt + "\">";
-          else collectionname = alt;
-        }
-        
-        if ((count == 1) || (count == (row1+1)) || (count == ((row1+row2)+1))) 
-          homeextra += "<td align=center>";
-        else homeextra += "<p>";
-        text_t link = "<a href=\"_gwcgi_?a=p&p=about&c=" + *collist_here + "\">";
-        if (*collist_here == "chinese")
-          link = "<a href=\"_gwcgi_?a=p&p=about&l=zh&nw=u&c=" + *collist_here + "\">";
-
-        if (!cinfo.receptionist.empty()) 
-          link = "<a href=\"" + cinfo.receptionist + "?a=p&p=about&c=" 
-            + *collist_here + "\">";
-        
-        homeextra += link + collectionname + "</a>\n";
-        
-        if ((count == row1) || (count == (row1+row2))) 
-          homeextra += "</td>";
-        
-        count ++;
-          }
-        }
-
-        collist_here ++;
-      }
-      homeextra += "</tr></table></center>\n";
-      disp.setmacro ("homeextra", "home", homeextra); 
-    }
-      }
-      rprotolist_here ++;
-    }
-  } else if (arg_p == "about") {
-    disp.setmacro ("numdocs", "about", collectinfo.numDocs);
-    unsigned long current_time = time(NULL);
-    unsigned long builddate = (current_time - collectinfo.buildDate) / 86400;
-    disp.setmacro ("builddate", "about", builddate);
-  }
-
-  if (arg_p == "about" || arg_p == "help") {
-
+    
     // _textbrowseoptions_ and _numbrowseoptions_
-
+    
     FilterResponse_t response;
     text_tset metadata;
@@ -316 +320 @@
 }
 
-bool pageaction::do_action (cgiargsclass &args, const ColInfoResponse_t &/*collectinfo*/, 
-                recptproto * /*collectproto*/, displayclass &disp, 
+bool pageaction::do_action (cgiargsclass &args, recptprotolistclass * /*protos*/, 
+                browsermapclass * /*browsers*/, displayclass &disp, 
                 outconvertclass &outconvert, ostream &textout, 
                 ostream &/*logout*/) {