Changeset 4905

Timestamp:

2003-07-12T04:29:59+12:00 (21 years ago)

Author:

sjboddie

Message:

Added 3 functions to change the way that collections are displayed
on the main site. Refer to the comments in the code for a further explanation.

Location:

trunk/gsdl/src/recpt

Files:

• pageaction.cpp (modified) (6 diffs)
• pageaction.h (modified) (2 diffs)
• receptionist.cpp (modified) (2 diffs)
• receptionist.h (modified) (1 diff)

trunk/gsdl/src/recpt/pageaction.cpp

@@ -24 +24 @@
  *********************************************************************/
 
+// Changelog:
+
+// 11th July 2003:
+
+//   Added 3 functions to deal with the collection style
+//   A deciding function and then 2 functions that actually
+//   do the work for us, either images or pulldown.
+
+
 #include "OIDtools.h"
 #include "pageaction.h"
@@ -104 +113 @@
 }
 
-void pageaction::set_homeextra_macro (displayclass &disp, recptprotolistclass *protos, 
-                      cgiargsclass &args, ostream &logout) {
-  text_t homeextra = "<center><table width=_pagewidth_><tr valign=top>\n";
-  bool found_valid_col = false;
-  
+// This function helps decide whether we want a
+// images or pulldown style collection display
+// We refer to the macro files for the options
+// for images or pulldown menu and use that to
+// switch to the appropriate function to do the job
+
+// Aly Dharshi
+// 11th July 2003
+
+void pageaction::homepagestyle(displayclass &disp, recptprotolistclass *protos,
+                   cgiargsclass &args, ostream &logout)
+{
+
+  const recptconf &configinfo = recpt->get_configinfo();
+
+  if (configinfo.HomePageType == "images") {
+     home_images(disp, protos, args, configinfo, logout);
+
+  } else
+     {
+    home_pulldown(disp, protos, args, configinfo, logout);
+     }
+}
+
+// This function allows for the Greenstone
+// collection to be displayed in a pull down
+// menu similar to that in documentaction.cpp
+
+// Aly Dharshi
+// 11th July 2003
+
+void pageaction::home_pulldown(displayclass &disp, recptprotolistclass *protos, 
+                   cgiargsclass &args, const recptconf &configinfo,
+                   ostream &logout) {
+   
+   //text_t homeextra = "<center><table width=_pagewidth_><tr valign=top>\n";
+  //bool found_valid_col = false;
+
+   text_t homeextra = "<form method=\"get\" name=\"browse\">\n";
+   homeextra += "<select name=\"collections\" onChange=\"location.href=";
+   homeextra += "document.browse.collections.options[document.browse.collections.selectedIndex].value\">\n";
+
+   
   recptprotolistclass::iterator rprotolist_here = protos->begin();
   recptprotolistclass::iterator rprotolist_end = protos->end();
@@ -164 +211 @@
           }
 
+          FilterResponse_t response;
+          text_tset metadata;
+          metadata.insert ("collectionname");
+          text_t collectionname = *collist_here;
+          
+          if (get_info ("collection", *collist_here, metadata, false, 
+                (*rprotolist_here).p, response, logout)) {
+         if (!response.docInfo[0].metadata["collectionname"].values[0].empty())
+            collectionname = response.docInfo[0].metadata["collectionname"].values[0];
+          }
+          
+          comerror_t err;
+          text_t optsite = "";
+          text_t site_name = (*rprotolist_here).p->get_site_name (err);
+          if (!site_name.empty()) { optsite = "site="+site_name+"&"; }
+          
+          text_t link = "_gwcgi_?"+optsite+"a=p&p=about&c=" + *collist_here + coll_type;
+          link += "&l=" + args["l"] + "&w=" + args["w"];
+
+          // We are "dynamically" overriding so to speak the
+          // link to the collection aka receptionist.
+          
+          if (!cinfo->receptionist.empty()) 
+         link = cinfo->receptionist;
+          
+          
+          homeextra += "<option value=\"" + link + "\"";
+          homeextra += ">" + collectionname + "</option>\n";
+                
+        }
+
+        collist_here ++;
+        }
+        
+      }
+      }
+    rprotolist_here ++;
+    }
+    
+    }
+  homeextra += "</select>\n";
+  homeextra += "</form>\n";
+  
+  disp.setmacro ("homeextra", "home", homeextra); 
+}
+  
+// originally called set_homeextra_macro
+// this function displays the Greenstone
+// main page as usual with the graphics for
+// the collections.
+
+// Aly Dharshi
+// 11th July 2003
+
+void pageaction::home_images(displayclass &disp, recptprotolistclass *protos, 
+                 cgiargsclass &args, const recptconf &configinfo,
+                 ostream &logout) {
+  
+  text_t homeextra = "<center><table width=_pagewidth_><tr valign=top>\n";
+  bool found_valid_col = false;
+
+  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 count = 0;
+    bool first = true;
+    while (collist_here != collist_end) {
+      ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr ((*rprotolist_here).p, *collist_here, logout);
+      
+      if (cinfo != NULL) {
+        if (cinfo->isPublic && (cinfo->buildDate > 0)) {
+
+          text_t coll_type = "&ct=";
+          if (cinfo->buildType == "mgpp") {
+        coll_type += "1&qto=";
+
+        // now we also want to check search types to set the qto arg 
+        if (cinfo->searchTypes.size() == 0) {
+          coll_type += "3"; // default to 3 (= both)
+        } else {
+          unsigned int search_types = 0;
+          text_tarray::const_iterator type_here = cinfo->searchTypes.begin();
+          text_tarray::const_iterator type_end = cinfo->searchTypes.end();
+          
+          while (type_here != type_end) {
+            if (*type_here == "form") {
+              search_types |= 2;
+            } else if (*type_here == "plain") {
+              search_types |= 1;
+            }
+            type_here ++;
+          }
+          coll_type += search_types;
+          if (search_types == 3) {
+            // both were specified, now need to look at the order to see which is the default
+            type_here = cinfo->searchTypes.begin();
+            if (*type_here == "form") { 
+              coll_type += "&qt=1"; // set the default to form
+            }
+          }
+ 
+        }
+          }
+          else {
+        coll_type += "0";
+          }
+
           found_valid_col = true;
           FilterResponse_t response;
@@ -215 +378 @@
 
           }
-          if ((count%3 == 0) && (!first))
+          if ((count%configinfo.HomePageCols == 0) && (!first))
         homeextra += "</tr><tr valign=top>\n";
           
@@ -238 +401 @@
     }
 
-    for (; count%3 != 0; count ++) homeextra += "<td></td>\n";
+    for (; count%configinfo.HomePageCols != 0; count ++) homeextra += "<td></td>\n";
       }
     }
@@ -614 +777 @@
 
     if (arg_p == "home") {
-      set_homeextra_macro (disp, protos, args, logout);
+      homepagestyle (disp, protos, args, logout);
     } else if (arg_p == "homehelp") {
       set_collectionlist_macro (disp, protos, logout);

trunk/gsdl/src/recpt/pageaction.h

@@ -66 +66 @@
   void configure (const text_t &key, const text_tarray &cfgline);
 
-protected:
-  void set_homeextra_macro (displayclass &disp, recptprotolistclass *protos, 
-                cgiargsclass &args, ostream &logout);
+ protected:
+  
+  void home_images (displayclass &disp, recptprotolistclass *protos, 
+           cgiargsclass &args, const recptconf &configinfo, ostream &logout);
+  
+  void home_pulldown (displayclass &disp, recptprotolistclass *protos, 
+              cgiargsclass &args, const recptconf &configinfo, ostream &logout);
+  
+  void homepagestyle (displayclass &disp, recptprotolistclass *protos, 
+              cgiargsclass &args, ostream &logout);
+  
 
+  
   void set_collectionlist_macro (displayclass &disp, recptprotolistclass *protos, 
                  ostream &logout);
@@ -83 +92 @@
 
 
+  
   bool status_disabled;
   bool collector_disabled;

trunk/gsdl/src/recpt/receptionist.cpp

@@ -73 +73 @@
   encodings.erase(encodings.begin(), encodings.end());
 
+  HomePageType = "images";
+  HomePageCols = 3;
+  
   // these default page parameters can always be overriden
   // in the configuration file
@@ -268 +271 @@
       }
     }
-    
+
+    else if (key == "SiteFormat") {
+       if (cfgline[0] == "HomePageType") {
+      configinfo.HomePageType = cfgline[1];
+       } else if (cfgline[0] == "HomePageCols") {
+      configinfo.HomePageCols = cfgline[1].getint();
+       }
+    }
+       
     else if (key == "cgiarg") {
       // get shortname

trunk/gsdl/src/recpt/receptionist.h

@@ -98 +98 @@
   bool EmailUserEvents;
 
+  text_t HomePageType; 
+  int HomePageCols;
+   
   text_tmap pageparams;
   text_t macroprecedence;