Changeset 2664

Timestamp:

2001-07-23T14:40:14+12:00 (23 years ago)

Author:

sjboddie

Message:

Re-introduced the old "u" cgi argument for suppressing certain parts of
the Greenstone interface (like searching) for use when generating static
collections.

Location:

trunk/gsdl

Files:

• images/nosearch.gif (added)
• macros/about.dm (modified) (1 diff)
• macros/base.dm (modified) (3 diffs)
• src/recpt/browsetools.cpp (modified) (1 diff)
• src/recpt/pageaction.cpp (modified) (1 diff)

trunk/gsdl/macros/about.dm

@@ -22 +22 @@
 _navigationbar_
 </center>
-_query:queryform_
-<p>_iconblankbar_
+_If_("_cgiargu_" ne "1",_query:queryform_
+<p>_iconblankbar_)
 _If_(_Global:collectionextra_,<p>_textabout_)
 _textsubcollections_

trunk/gsdl/macros/base.dm

@@ -149 +149 @@
 # this receptionist.
 
-_imagesearch_ {_gsimage_(_httpquery_,_httpicontsrchof_,_httpicontsrchon_,srch,_textimagesearch_)}
+_imagesearch_ {_If_("_cgiargu_" ne "1",_imagesearch2_,_iconnosearch_)}
+_imagesearch2_ {_gsimage_(_httpquery_,_httpicontsrchof_,_httpicontsrchon_,srch,_textimagesearch_)}
 _imageTitle_ {_gsimage_(_httpbrowseTitle_,_httpiconttitlof_,_httpiconttitlon_,titles,_textimageTitle_)}
 _imageCreator_ {_gsimage_(_httpbrowseCreator_,_httpicontauthof_,_httpicontauthon_,authors,_textimageCreator_)}
@@ -470 +471 @@
 _iconmidi_[v=1] {_texticonmidi_}
 
+_iconnosearch_ {<img src="_httpimg_/nosearch.gif">}
+
 #######################################################################
 # Image links 
@@ -476 +479 @@
 #######################################################################
 
-_imagehome_ {_gsimage_(_httppagehome_,_httpiconchomeof_,_httpiconchomeon_,homer,_textimagehome_)}
+_imagehome_ {_If_("_cgiargu_" ne "1",_imagehome2_)}
+_imagehome2_ {_gsimage_(_httppagehome_,_httpiconchomeof_,_httpiconchomeon_,homer,_textimagehome_)}
 
 _imagehelp_ {_gsimage_(_httppagehelp_,_httpiconchelpof_,_httpiconchelpon_,help,_textimagehelp_)}
 
-_imagepref_ {_gsimage_(_httppagepref_,_httpiconcprefof_,_httpiconcprefon_,pref,_textimagepref_)}
+_imagepref_ {_If_("_cgiargu_" ne "1",_imagepref2_)}
+_imagepref2_ {_gsimage_(_httppagepref_,_httpiconcprefof_,_httpiconcprefon_,pref,_textimagepref_)}
 
 _imagegreenstone_ {<img src="_httpicongsdl_" width="_widthgsdl_" height="_heightgsdl_" border="0" alt="_textimagegreenstone_" hspace=0>}

trunk/gsdl/src/recpt/browsetools.cpp

@@ -571 +571 @@
     else if (formatinfo.DocumentTitles)
       output_titles (args, collectproto, formatinfo, disp, outconvert, textout, logout);
-    output_controls (args, formatinfo.DocumentButtons, collectproto, disp, 
-             outconvert, textout, logout);
+    if (args["u"] != "1") {
+      output_controls (args, formatinfo.DocumentButtons, collectproto, disp, 
+               outconvert, textout, logout);
+    }
     textout << "</td><td valign=top>\n";  
     havecontrols = true;

trunk/gsdl/src/recpt/pageaction.cpp

@@ -68 +68 @@
   arg_ainfo.savedarginfo = cgiarginfo::mustnot;
   argsinfo.addarginfo (NULL, arg_ainfo);
+
+  // the "u" argument will disable the search facility, remove links to the
+  // home and preferences pages, and disable the DocumentButton buttons
+  // (for use when generating static html versions of collections)
+  arg_ainfo.shortname = "u";
+  arg_ainfo.longname = "static page";
+  arg_ainfo.multiplechar = false;
+  arg_ainfo.defaultstatus = cgiarginfo::weak;
+  arg_ainfo.argdefault = "0";
+  arg_ainfo.savedarginfo = cgiarginfo::mustnot;
+  argsinfo.addarginfo (NULL, arg_ainfo);
 }