Changeset 2329

Timestamp:

2001-04-20T13:19:37+12:00 (23 years ago)

Author:

sjboddie

Message:

Added a "help" link to the default home page

Location:

trunk/gsdl

Files:

• macros/base.dm (modified) (1 diff)
• macros/home.dm (modified) (3 diffs)
• src/recpt/pageaction.cpp (modified) (3 diffs)
• src/recpt/pageaction.h (modified) (1 diff)

trunk/gsdl/macros/base.dm

@@ -209 +209 @@
 _httppagehome_ {_gwcgi_?a=p&p=home}
 _httppagehelp_ {_httppagex_(help)}
+_httppagehomehelp_ {_httppagex_(homehelp)}
 _httppagepref_ {_httppagex_(preferences)}
 _httpclearhistory_ {_gwcgi_?e=_compressedoptions_&a=dh}

trunk/gsdl/macros/home.dm

@@ -35 +35 @@
 _imageadmin_ {_gsimage_(_httppagestatus_,_httpimg_/cadminof.gif,_httpimg_/cadminon.gif,admin,Administration Page)}
 _imagegogreenstone_ {_gsimage_(_home:httppagegsdl_,_httpimg_/cabgsof.gif,_httpimg_/cabgson.gif,gogs,About Greenstone)}
+_imagegohelp_ {_gsimage_(_home:httppagehomehelp_,_httpimg_/choheof.gif,_httpimg_/choheon.gif,hohe,Help)}
 
 #######################################################################
@@ -63 +64 @@
 </center>
 <p><table>
+_textgohelp_
 _textgocollector_
 _textgoadmin_
@@ -98 +100 @@
 </tr>
 }
+
+_textgohelp_ {
+<tr valign=top>
+<td valign=top>_imagegohelp_</td>
+<td>Help text about this Greenstone installation</td>
+</tr>
+}
+
+
+
+package homehelp
+
+_collectionlist_ {}
+
+_javalinks_ {_imagehome_}
+_javalinks_ [v=1] {
+_imagehome_<br>
+}
+
+_content_ {
+<center>
+<p>_iconblankbar_
+</center>
+<p>
+<table border=0 cellspacing=0 cellpadding=0>
+ <tr>
+  <td valign=top align=center>_imagegreenstone_</td>
+  <td valign=top>
+  Greenstone is a suite of software which has the ability to serve digital
+  library collections and build new collections.  It provides a new way of
+  organizing information and publishing it on the Internet or on CD-ROM.
+  Greenstone is produced by the New Zealand Digital Library Project at the
+  University of Waikato, and distributed in cooperation with UNESCO and the
+  Humanities Library Project. It is open-source software, available from
+  <i>http://nzdl.org</i> under the terms of the GNU General Public License.
+  <br><br>
+  </td>
+ </tr>
+</table>
+
+<center>
+<p>_iconblankbar_
+</center>
+_If_(_collectionlist_,_collectionlist_,
+<p>There are currently no collections available to this Greenstone installation. 
+To add some collections you may either
+<ul><li>Use <a href="_httppagecollector_">The Collector</a> to build new collections
+    <li>If you have a Greenstone cd-rom you may install collections from cd-rom
+</ul>)
+
+<center>
+<p>_iconblankbar_
+</center>
+<p>There are three further buttons on the home page
+<p><table>
+_home:textgocollector_
+_home:textgoadmin_
+_home:textgogreenstone_
+</table>
+<center>
+<p>_iconblankbar_
+</center>
+}

trunk/gsdl/src/recpt/pageaction.cpp

@@ -197 +197 @@
 }
 
+void pageaction::set_collectionlist_macro (displayclass &disp, recptprotolistclass *protos, 
+                       ostream &logout) {
+
+  text_t collectionlist;
+  int count = 0;
+  
+  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();
+
+    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)) {
+
+          count ++;
+
+          text_t coll_type = "&ct=";
+          if (cinfo->buildType == "mgpp") {
+        coll_type += "1";
+          }
+          else {
+        coll_type += "0";
+          }
+          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 = "<a href=\"_gwcgi_?"+optsite+"a=p&p=about&c=" + *collist_here + coll_type+"\">";
+
+          if (!cinfo->receptionist.empty()) 
+        link = "<a href=\"" + cinfo->receptionist + "\">";
+          
+         collectionlist += "<li>" + link + collectionname + "</a>\n";
+        }
+      }
+      collist_here ++;
+    }
+      }
+    }
+    rprotolist_here ++;
+  }
+
+  if (count == 1) {
+    collectionlist = "<p>This Greenstone installation contains 1 collection\n<ul>" +
+      collectionlist + "</ul>\n";
+  } else if (count > 1) {
+    collectionlist = "<p>This Greenstone installation contains " + text_t(count) + 
+      " collections\n<ul>" + collectionlist + "</ul>\n";
+  }
+
+  disp.setmacro ("collectionlist", "homehelp", collectionlist); 
+}
+
 void pageaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
                      recptprotolistclass *protos, ostream &logout) {
@@ -243 +319 @@
   // _textgoadmin_         set to "" if status is disabled in main.cfg
 
+
+  // if page is "homehelp"
+  // _collectionlist_      list of available collections to be displayed on the homehelp page
   
   if (recpt == NULL) {
@@ -475 +554 @@
       }
     }
+
+  } else if (arg_p == "homehelp") {
+    
+    set_collectionlist_macro (disp, protos, logout);
+
   }
 }

trunk/gsdl/src/recpt/pageaction.h

@@ -70 +70 @@
                 ostream &logout);
 
+  void set_collectionlist_macro (displayclass &disp, recptprotolistclass *protos, 
+                 ostream &logout);
+
+
   bool status_disabled;
   bool collector_disabled;