Changeset 2767 for trunk/gsdl

Timestamp:

2001-10-02T12:05:43+12:00 (23 years ago)

Author:

sjboddie

Message:

altered the docs page to avoid broken links when documentation isn't
installed along with Greenstone

Location:

trunk/gsdl

Files:

• macros/docs.dm (modified) (3 diffs)
• macros/english2.dm (modified) (1 diff)
• src/recpt/pageaction.cpp (modified) (4 diffs)
• src/recpt/pageaction.h (modified) (1 diff)

trunk/gsdl/macros/docs.dm

@@ -1 +1 @@
 package docs
 
+# set from within server
+_documentation_ {}
 
 #######################################################################
@@ -18 +20 @@
 #######################################################################
 
-_icongsdocsgr_ {<img src="_httpimg_/gsdocsgr.gif">}
+_icongsdocsgr_ {<img src="_httpicongsdocsgr_">}
 _httpiconpdf_ {_httpimg_/pdf.gif}
 _iconpdf_ {<img src="_httpiconpdf_" border=0>}
@@ -24 +26 @@
 _httpdocs_ {_httpprefix_/docs}
 
-_pagetitle_ {Greenstone Digital Library Software}
+_pagetitle_ {_textimagegreenstone_}
 
 _content_ {
 _icongsdocsgr_
-
-<p>
-<table border=0>
-<tr valign=middle><td><a href="_httpdocs_/User.pdf">_iconpdf_</a></td><td>User's Guide</td></tr>
-<tr valign=middle><td><a href="_httpdocs_/Install.pdf">_iconpdf_</a></td><td>Installer's Guide</td></tr>
-<tr valign=middle><td><a href="_httpdocs_/Developer.pdf">_iconpdf_</a></td><td>Developer's Guide</td></tr>
-<tr valign=middle><td><a href="_httpdocs_/From_paper_to_collection.pdf">_iconpdf_</a></td><td>From Paper to Collection Guide</td></tr>
-</table>
+_If_(_documentation_,_documentation_,_textnodocumentation_)
 
 _nzdlpagefooter_

trunk/gsdl/macros/english2.dm

@@ -140 +140 @@
 _textmessagestalekey_ {The link you have followed is now stale. 
 Please enter your password to access this page.}
+
+
+######################################################################
+# 'docs' page 
+package docs
+######################################################################
+
+
+#------------------------------------------------------------
+# text macros
+#------------------------------------------------------------
+
+_textnodocumentation_ {
+<p>This Greenstone installation does not include any documentation. This
+may be because:
+<ol>
+ <li>Greenstone was installed from CD-ROM using a compact installation.
+ <li>Greenstone was installed from a distribution downloaded from the
+ internet.
+</ol>
+In either case you may obtain the documentation either from the <i>docs</i>
+directory of a Greenstone CD-ROM or by visiting <a
+href="http://www.greenstone.org">http://www.greenstone.org</a>.
+}
+
+_textuserguide_ {User's Guide}
+_textinstallerguide_ {Installer's Guide}
+_textdeveloperguide_ {Developer's Guide}
+_textpaperguide_ {From Paper to Collection Guide}
+
+#------------------------------------------------------------
+# icons
+#------------------------------------------------------------
+
+## "greenstone documentation" ## green_bar_left_aligned ## gsdocsgr ##
+_httpicongsdocsgr_ {_httpimg_/gsdocsgr.gif}
+_widthgsdocsgr_ {_pagewidth_}
+_heightgsdocsgr_ {17}
+

trunk/gsdl/src/recpt/pageaction.cpp

@@ -27 +27 @@
 #include "pageaction.h"
 #include "receptionist.h"
+#include "fileutil.h"
 #include <time.h>
 
@@ -296 +297 @@
 }
 
+void pageaction::set_documentation_macro (displayclass &disp) {
+
+  text_t documentation;
+  text_t docsdir = filename_cat(gsdlhome, "docs");
+  
+  if (file_exists(filename_cat(docsdir, "User.pdf"))) {
+    documentation += "<tr valign=middle><td><a href=\"_httpdocs_/User.pdf\">_iconpdf_"
+      "</a></td><td>_textuserguide_</td></tr>";
+  }
+  
+  if (file_exists(filename_cat(docsdir, "Install.pdf"))) {
+    documentation += "<tr valign=middle><td><a href=\"_httpdocs_/Install.pdf\">_iconpdf_"
+      "</a></td><td>_textinstallerguide_</td></tr>";
+  }
+  
+  if (file_exists(filename_cat(docsdir, "Develop.pdf"))) {
+    documentation += "<tr valign=middle><td><a href=\"_httpdocs_/Develop.pdf\">_iconpdf_"
+      "</a></td><td>_textdeveloperguide_</td></tr>";
+  }
+  
+  if (file_exists(filename_cat(docsdir, "Paper.pdf"))) {
+    documentation += "<tr valign=middle><td><a href=\"_httpdocs_/Paper.pdf\">_iconpdf_"
+      "</a></td><td>_textpaperguide_</td></tr>";
+  }
+
+  if (!documentation.empty()) {
+    disp.setmacro("documentation", "docs", "<p>\n<table border=0>\n" + documentation + "\n</table>\n");
+  }
+}
+
 void pageaction::define_internal_macros (displayclass &disp, cgiargsclass &args, 
                      recptprotolistclass *protos, ostream &logout) {
@@ -348 +379 @@
   // if page is "homehelp"
   // _collectionlist_      list of available collections to be displayed on the homehelp page
+
+  
+  // if page is "docs"
+  // _documentation_       links to PDF documents if they're available
+
   
   if (recpt == NULL) {
@@ -599 +635 @@
     set_collectionlist_macro (disp, protos, logout);
 
+  } else if (arg_p == "docs") {
+
+    set_documentation_macro (disp);
+
   }
 }

trunk/gsdl/src/recpt/pageaction.h

@@ -73 +73 @@
                  ostream &logout);
 
+  void set_documentation_macro (displayclass &disp);
 
   bool status_disabled;