Index: /trunk/gsdl/macros/about.dm
===================================================================
--- /trunk/gsdl/macros/about.dm	(revision 875)
+++ /trunk/gsdl/macros/about.dm	(revision 876)
@@ -9,17 +9,23 @@
 # don't want link to 'about' page
 _imagecollection_ {_If_("_iconcollection_" ne "",
-	<img src="_iconcollection_" border=0>,
-	<br><br><h2>_collectionname_</h2>}
+	<img src="_iconcollection_" border=0>,	<br><br><h2>_collectionname_</h2>}
 
 #######################################################################
-# English language text 
+# about page content 
 #######################################################################
 
-_texthelpexpl_ {For help at any time, press this button at the top of the page}
+_pagetitle_ {_collectionname_}
 
-_textretabout_ {To return to this "about" page, click the "collection"
-icon at the top left of the page.}
-
-_textabcol_ {About this collection}
+_content_ {
+<center>
+_navigationbar_
+</center>
+_query:queryform_
+<p>_iconblankbar_
+<p>_textabout_
+_textsubcollections_
+<h3>_help:textsimplehelpheading_</h3>
+_help:simplehelp_
+}
 
 _textabout_ {
@@ -28,36 +34,10 @@
 }
 
-#######################################################################
-# Maori language text 
-#######################################################################
+# set from within server
+_textsubcollections_ {}
 
-_texthelpexpl_ [l=mi] {Kia titiro ki ng&auml; kupu &auml;whina p&auml;whiritia t&euml;nei
-p&auml;tene kei runga r&auml; o te wh&auml;rangi}
 
-_textabcol_ [l=mi] {He kupu whakam&auml;rama i te kohikohinga niupepa}
 
-##############
-# about page #
-##############
 
-_pagetitle_ {_collectionname_: About this collection}
 
-_content_ {
-<center>
-_navigationbar_
-</center>
-_query:queryform_
-<p>
-_iconblankbar_<br>
-<i>_textretabout_</i>
-<table cellpadding=3 cellspacing=0 border=0>
-<tr valign=bottom><td><img src="_httpiconchelpon_" width=_widthchelpx_ height=_heightchelpx_></td>
-<td><i>_texthelpexpl_</i>
-</td></tr></table>
-_iconblankbar_
-<p>
-_textabout_
-<h3>_help:textsimplehelpheading_</h3>
-_help:simplehelp_
-}
 
Index: /trunk/gsdl/macros/authen.dm
===================================================================
--- /trunk/gsdl/macros/authen.dm	(revision 875)
+++ /trunk/gsdl/macros/authen.dm	(revision 876)
@@ -6,5 +6,5 @@
 #######################################################################
 
-_pagetitle_ {Greenstone Digital Library}
+_pagetitle_ {_textGSDLtitle_}
 _imagethispage_ {_imagegreenstone_}
 
@@ -14,10 +14,10 @@
 
 <form name="login" method="get" action="_gwcgi_">
-<input type=hidden name="e" value="_If_(_cgiarger_,_cgiarger_,_compressedoptions_)">
+<input type=hidden name="e" value="_If_(_cgiarger_,_cgiarger_,_decodedcompressedoptions_)">
 _hiddenargs_
 
 <table border=0>
-<tr><td>username</td><td><input type="text" name="un" value="_cgiargun_" size=10></td></tr>
-<tr><td>password</td><td><input type="password" name="pw" size=10></td></tr>
+<tr><td>_textusername_</td><td><input type="text" name="un" value="_cgiargun_" size=10></td></tr>
+<tr><td>_textpassword_</td><td><input type="password" name="pw" size=10></td></tr>
 <tr><td></td><td><input type="submit" value="sign in"></td></tr>
 </table>
@@ -26,19 +26,15 @@
 
 
-_messageinvalid_ {The page you have requested requires you to sign in.
-Please enter your username
-and password.}
+_messageinvalid_ {_textmessageinvalid_}
 
-_messagefailed_ {Either your user name or password was incorrect.}
+_messagefailed_ {_textmessagefailed_}
 
 _messageenabled_ {}
 
-_messagedisabled_ {Sorry, you account has been disabled. Please contact
-the webmaster for this site.}
+_messagedisabled_ {_textmessagedisabled_}
 
-_messagepermissiondenied_ {Sorry, you do not have permission to access this page.}
+_messagepermissiondenied_ {_textmessagepermissiondenied_}
 
-_messagestalekey_ {The link you have followed is now stale. 
-Please enter your password to access this page.}
+_messagestalekey_ {_textmessagestalekey_}
 
 
@@ -54,5 +50,5 @@
 #######################################################################
 
-_pagetitle_ {Greenstone Digital Library}
+_pagetitle_ {_authen:textGSDLtitle_}
 _imagethispage_ {_imagegreenstone_}
 
@@ -60,2 +56,9 @@
 _authen:messagestatus_
 }
+
+
+
+
+
+
+
Index: /trunk/gsdl/macros/base.dm
===================================================================
--- /trunk/gsdl/macros/base.dm	(revision 875)
+++ /trunk/gsdl/macros/base.dm	(revision 876)
@@ -7,17 +7,12 @@
 ##########
 
-# this is a hack for the chinese collection and should be removed once 
-# the collection metadata is fixed up 
-_documents_ [c=chinese] {document sections}
-_documents_ [c=chinese,l=zh] {ææ¬}
-_titles_ [c=chinese] {titles}
-_titles_ [c=chinese,l=zh] {é¢å}
-_chinese_ {Chinese demonstration collection}
-
-##########
-
-_collectionextra_ {This collection contains _about:numdocs_ documents. 
-It was last built _about:builddate_ days ago.}
-
+# won't need this once old versions of library are no longer used
+_decodedcompressedoptions_ {_compressedoptions_}
+
+
+_htmlextra_ {}
+
+_starthighlight_ {<b><u>}
+_endhighlight_ {</u></b>}
 
 #######################################################################
@@ -28,7 +23,6 @@
 
 _content_ {<p><h2>oops</h2>
-The requested page could not be found. Please use your browsers 'back' button
-or the above home button to return to the Greenstone Digital Library.}
-_pagetitle_ {GSDL Error}
+_textdefaultcontent_}
+_pagetitle_ {_textdefaulttitle_}
 _imagethispage_ {}
 _iconcollection_ {}
@@ -340,5 +334,5 @@
 _mailaddr_ {nzdl@nzdl.org}
 
-
+_gsdltop_ {_top}
 
 #######################################################################
@@ -347,4 +341,6 @@
 # These contain the url without any quotes
 #######################################################################
+
+_httpcollimg_ {_httpcollection_/index/assoc}
 
 _httpcollection_{_httpprefix_/collect/_cgiargc_}
@@ -355,5 +351,5 @@
 #_httppagehome_ {_httppagex_(home)}
 #_httppagehome_ {_gwcgi_?a=p&p=home}
-_httppagehome_ {http://www.nzdl.org/cgi-bin/sblibrary?a=p&p=home}
+_httppagehome_ {http://www.nzdl.org/fast-cgi-bin/library?a=p&p=home}
 _httppagehelp_ {_httppagex_(help)}
 _httppagepref_ {_httppagex_(preferences)}
@@ -363,5 +359,10 @@
 _httpcurrentdocument_ {_gwcgi_?e=_compressedoptions_&cl=_cgiargcl_&d=_cgiargd_}
 _httpquery_ {_gwcgi_?e=_compressedoptions_&a=q}
+
+# _httpdoc_ is the same as _httpdocument_ - _httpdocument_
+# may occasionally be altered by the server however
 _httpdocument_ {_gwcgi_?e=_compressedoptions_&a=d}
+_httpdoc_  {_gwcgi_?e=_compressedoptions_&a=d}
+
 _httpextlink_ {_gwcgi_?e=_compressedoptions_&a=extlink}
 _httpbuild_ {_gwcgi_?e=_compressedoptions_&a=bc}
@@ -373,25 +374,37 @@
 _httpiconchelpof_ {_httpimg_/chelpof.gif}
 _httpiconchelpof_ [l=mi] {_httpimg_/mchelpof.gif}
+_httpiconchelpof_[l=zh] {_httpimg_/zhchelpof.gif}
 _httpiconchelpon_ {_httpimg_/chelpon.gif}
 _httpiconchelpon_ [l=mi] {_httpimg_/mchelpon.gif}
+_httpiconchelpon_[l=zh] {_httpimg_/zhchelpon.gif}
 _widthchelpx_ {36}
 _widthchelpx_ [l=mi] {57}
+_widthchelpx_[l=zh] {41}
 _heightchelpx_ {20}
+_heightchelpx_[l=zh] {20}
 
 _httpiconchomeof_ {_httpimg_/chomeof.gif}
 _httpiconchomeof_ [l=mi] {_httpimg_/mchomeof.gif}
+_httpiconchomeof_[l=zh] {_httpimg_/zhchomeof.gif}
 _httpiconchomeon_ {_httpimg_/chomeon.gif}
 _httpiconchomeon_ [l=mi] {_httpimg_/mchomeon.gif}
+_httpiconchomeon_[l=zh] {_httpimg_/zhchomeon.gif}
 _widthchomex_ {43}
 _widthchomex_ [l=mi] {54}
+_widthchomex_[l=zh] {41}
 _heightchomex_ {20}
+_heightchomex_[l=zh] {20}
 
 _httpiconcprefof_ {_httpimg_/cprefof.gif}
 _httpiconcprefof_ [l=mi] {_httpimg_/mcprefof.gif}
+_httpiconcprefof_[l=zh] {_httpimg_/zhcprefof.gif}
 _httpiconcprefon_ {_httpimg_/cprefon.gif}
 _httpiconcprefon_ [l=mi] {_httpimg_/mcprefon.gif}
+_httpiconcprefon_[l=zh] {_httpimg_/zhcprefon.gif}
 _widthcprefx_ {87}
 _widthcprefx_ [l=mi] {103}
+_widthcprefx_[l=zh] {41}
 _heightcprefx_ {20}
+_heightcprefx_[l=zh] {20}
 
 _httpiconcabtof_ {_httpimg_/cabtof.gif}
@@ -409,4 +422,5 @@
 
 _httpiconhhelp_ {_httpimg_/h\_help.gif}
+_httpiconhhelp_[l=zh] {_httpimg_/zhh\_help.gif}
 _widthhhelp_ {200}
 _heighthhelp_ {57}
@@ -450,4 +464,11 @@
 _widthtauthx_ {110}
 _heighttauthx_ {17}
+
+_httpicontauthgr_[l=zh] {_httpimg_/zhtauthgr.gif}
+_httpicontauthof_[l=zh] {_httpimg_/zhtauthof.gif}
+_httpicontauthon_[l=zh] {_httpimg_/zhtauthon.gif}
+_widthtauthx_[l=zh] {110}
+_heighttauthx_[l=zh] {17}
+
 
 _httpicontsergr_ {_httpimg_/tsergr.gif}
@@ -509,4 +530,19 @@
 _heighttsrchx_ {17}
 
+_httpicontsrchgr_[l=zh] {_httpimg_/zhtsrchgr.gif}
+_httpicontsrchof_[l=zh] {_httpimg_/zhtsrchof.gif}
+_httpicontsrchon_[l=zh] {_httpimg_/zhtsrchon.gif}
+_widthtsrchx_[l=zh] {87}
+_heighttsrchx_[l=zh] {17}
+
+_httpiconcontoff_[l=zh] {_httpimg_/zhcontoff.gif}
+_httpiconconton_[l=zh] {_httpimg_/zhconton.gif}
+_widthcontx_[l=zh] {76}
+_heightcontx_[l=zh] {17}
+
+_httpiconhauth_[l=zh] {_httpimg_/zhh\_auth.gif}
+_widthhauth_[l=zh] {200}
+_heighthauth_[l=zh] {57}
+
 _httpicontlistgr_ {_httpimg_/tlistgr.gif}
 _httpicontlistof_ {_httpimg_/tlistof.gif}
@@ -521,4 +557,10 @@
 _heightttitlx_ {17}
 
+_httpiconttitlgr_[l=zh] {_httpimg_/zhttitlgr.gif}
+_httpiconttitlof_[l=zh] {_httpimg_/zhttitlof.gif}
+_httpiconttitlon_[l=zh] {_httpimg_/zhttitlon.gif}
+_widthttitlx_[l=zh] {87}
+_heightttitlx_[l=zh] {17}
+
 _httpicontpeopgr_ {_httpimg/tpeopgr.gif}
 _httpicontpeopof_ {_httpimg/tpeopof.gif}
@@ -606,4 +648,20 @@
 _heightaclsdfdr_ {15}
 
+_httpiconhpref_[l=zh] {_httpimg_/zhh\_pref.gif}
+_widthhpref_[l=zh] {200}
+_heighthpref_[l=zh] {57}
+
+_httpiconhsearch_[l=zh] {_httpimg_/zhh\_sear.gif}
+_widthhsearch_[l=zh] {200}
+_heighthsearch_[l=zh] {57}
+
+_httpiconhtitle_[l=zh] {_httpimg_/zhh\_title.gif}
+_widthhtitle_[l=zh] {200}
+_heighthtitle_[l=zh] {57}
+
+_httpiconqryresb_[l=zh] {_httpimg_/zhqryresb.gif}
+_widthqryresb_[l=zh] {537}
+_heightqryresb_[l=zh] {17}
+
 
 #######################################################################
@@ -670,5 +728,5 @@
 _icontabPeoplegreen_[v=1] {_texticontabPeoplegreen_}
 
-_iconblankbar_ {<center><img src="_httpicondivb_" width=_widthdivb_ height=_heightdivb_></center>}
+_iconblankbar_ {<center><img src="_httpicondivb_" width=_widthdivb_ height=6></center>}
 _iconblankbar_[v=1] {<br><hr><br>}
 
@@ -681,4 +739,5 @@
 _iconclosedbook_ {<img src="_httpiconbook_" width=_widthbook_ height=_heightbook_ border=0 alt="_texticonclosedbook_">}
 _iconclosedbook_ [v=1] {<small><b>_texticonclosedbook_: </b></small>}
+_iconclosedbook_ [v=1,l=zh]{<small><_font_><b>_texticonclosedbook_: </b></font></small>}
 
 
@@ -740,62 +799,5 @@
 ################################
 
-_textimagecollection_ {}
-_textimageabout_ {About page}
-_textimagehome_ {Home page}
-_textimagehelp_ {Help page}
-_textimagepref_ {Preferences page}
-_textimagegreenstone_ {Greenstone Digital Library Software}
-
-_textimagesearch_ {Search for specific terms}
-_textimageTitle_ {Browse alphabetical list of titles}
-_textimageList_ {Browse document listing}
-_textimageCreator_ {Browse alphabetical list of authors}
-_textimageSeries_ {Browse by issue}
-_textimageDate_ {Browse by date}
-_textimageSubject_ {Browse by subject category}
-_textimageOrganization_ {Browse by organization}
-_textimageHowto_ {Browse how to categories}
-_textimageTopic_ {Browse special topic issues}
-_textimageBrowse_ {Browse}
-_textimagePeople_ {Browse alphabetical list of People}
-
-_texticontabsearchgreen_{Search}
-_texticontabdategreen_{Dates}
-_texticontabseriesgreen_{Series}
-_texticontabauthorgreen_{Authors A-Z}
-_texticontabtitlegreen_{Titles A-Z}
-_texticontablistgreen_ {Listing}
-_texticontabsubjectgreen_{Subjects}
-_texticontaborggreen_{Organization}
-_texticontabhowgreen_{How to}
-_texticontabtopicgreen_{Topics}
-_texticontabbrwsegreen_{Browse}
-_texticontabPeoplegreen_{People A-Z}
-
-_texticontext_ {View the document}
-_texticonclosedbook_ {open this document and view contents}
-_texticonnext_ {to next section}
-_texticonprev_ {to previous section}
-
-_page_ {page }
-_of_ { of }
-_vol_ {Volume}
-_num_ {Number}
-
-_textmonth00_ {}
-_textmonth01_ {January}
-_textmonth02_ {February}
-_textmonth03_ {March}
-_textmonth04_ {April}
-_textmonth05_ {May}
-_textmonth06_ {June}
-_textmonth07_ {July}
-_textmonth08_ {August}
-_textmonth09_ {September}
-_textmonth10_ {October}
-_textmonth11_ {November}
-_textmonth12_ {December}
-
-_magazines_ {Magazines}
+# moved to english.dm
 
 ################################
@@ -803,36 +805,18 @@
 ################################
 
-_textimagehelp_ [l=mi] {Te wh&auml;rangi whakam&auml;rama}
-_textimagepref_ [l=mi] {Te wh&auml;rangi o ng&auml; whiriwhiringa}
-_textimagehome_ [l=mi] {Te wh&auml;rangi k&auml;inga}
-_textimagesearch_ [l=mi] {rapua he kupu}
-_textimagebrowseseries_ [l=mi] {Tirohia te whakar&auml;rangi o ng&auml; niupepa}
-_textimagebrowsedates_ [l=mi] {Tirohia te w&auml; i puta mai ai ng&auml; niupepa}
-
-_page_ [l=mi] {wh&auml;rangi }
-_vol_ [l=mi] {Pukapuka}
-_num_ [l=mi] {Nama}
-_textmonth01_ [l=mi] {Hanuere}
-_textmonth02_ [l=mi] {Pepuere}
-_textmonth03_ [l=mi] {Maehe}
-_textmonth04_ [l=mi] {Aperira}
-_textmonth05_ [l=mi] {Mei}
-_textmonth06_ [l=mi] {Hune}
-_textmonth07_ [l=mi] {Hurae}
-_textmonth08_ [l=mi] {Akuhata}
-_textmonth09_ [l=mi] {Hepetema}
-_textmonth10_ [l=mi] {Oketopa}
-_textmonth11_ [l=mi] {Noema}
-_textmonth12_ [l=mi] {Tihema}
-_of_ [l=mi] { i te }
-
-
-_texticontabsearchgreen_ [l=mi] {rapu}
-_texticontabdatesgreen_ [l=mi] {w&auml;taka}
-_texticontabseriesgreen_ [l=mi] {whakar&auml;rangi niupepa}
-_texticonnext_ [l=mi] {titiro ki te wh&auml;rangi o muri}
-_texticonprev_ [l=mi] {titiro ki te wh&auml;rangi o mua}
-_texticontext_ [l=mi] {Tirohia te wh&auml;rangi}
-
-_textimageSeries_ [l=mi] {Tirohia te whakar&auml;rangi taitara}
-_textimageDate_ [l=mi] {Tirohia te whakar&auml;rangi w&auml;taka}
+# moved to maori.dm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/gsdl/macros/document.dm
===================================================================
--- /trunk/gsdl/macros/document.dm	(revision 875)
+++ /trunk/gsdl/macros/document.dm	(revision 876)
@@ -120,5 +120,5 @@
 _gotoform_ {
 <form name="GotoForm" method="get" action="_gwcgi_">
-<input type=hidden name="e" value="_compressedoptions_">
+<input type=hidden name="e" value="_decodedcompressedoptions_">
 <input type=hidden name="d" value="_cgiargd_">
 <input type=hidden name="cl" value="_cgiargcl_">
@@ -435,51 +435,6 @@
 #######################################################################
 
-_textTitlepage_ {_texticonhtitle_}
-_textCreatorpage_ {_texticonhauth_}
-_textSubjectpage_ {_texticonhsubj_}
-_textSeriespage_ {_texticonhser_}
-_textDatepage_ {_texticonhdate_}
-_textHowtopage_ {_texticonhhow_}
-_textOrganizationpage_ {_texticonhorg_}
-_textBrowsepage_ {_texticonhbrwse_}
-_textPeoplepage_ {_texticonhpeople_}
-
-_texticonhtitle_ {Titles A-Z}
-_texticonhauth_ {Authors A-Z}
-_texticonhsubj_ {Subjects}
-_texticonhser_ {Series}
-_texticonhdate_ {Dates}
-_texticonhhow_ {How to}
-_texticonhorg_ {Organizations}
-_texticonhbrwse_ {Browse}
-_texticonhpeople_ {People A-Z}
-
-_texticonopenbookshelf_ {close this section of the library}
-_texticonclosedbookshelf_ {open this section of the library and view contents}
-_texticonopenbook_ {close this book}
-_texticonclosedfolder_ {Open this folder and view contents}
-_texticonclosedfolder2_ {open sub-section: }
-_texticonopenfolder_ {close this folder}
-_texticonopenfolder2_ {close sub-section: }
-_texticonsmalltext_ {View this section of the text}
-_texticonsmalltext2_ {view text: }
-_texticonpointer_ {current section}
-_texticondetach_ {Open this page in a new window}
-_texticonhighlight_ {Highlight search terms}
-_texticonnohighlight_ {Don't highlight search terms}
-_texticoncontracttoc_ {Collapse table of contents}
-_texticonexpandtoc_ {Expand table of contents}
-_texticonexpandtext_ {Display all text}
-_texticoncontracttext_ {Display text only for currently selected section}
-_texticonwarning_ {<b>Warning: </b>}
-_texticoncont_ {continue?}
-
-_textltwarning_ {
-<p><center>
-<table cellspacing=0 cellpadding=0 width=_pagewidth_>
-<tr valign=top><td>_iconwarning_Expanding the text here will generate a large 
-amount of data for your browser to display _imagecont_
-</td></tr></table></center>
-}
+# moved to english.dm
+
 
 
@@ -488,16 +443,5 @@
 #######################################################################
 
-_texticondetach_ [l=mi] {Huakina mai he matapihi hou m&ouml; t&euml;nei k&ouml;rero}
-_texticonexpandtext_ [l=mi] {Titiro ki ng&auml; kupu katoa o t&euml;nei niupepa}
-_texticoncontracttext_ [l=mi] {Titiro ki ng&auml; kupu o t&euml;nei wh&auml;rangi anake}
-_texticonopenbookshelf_ [l=mi] {k&auml;tia}
-_texticonclosedbookshelf_ [l=mi] {whakat&uuml;whera mai}
-_texticonclosedbook_ [l=mi] {whakat&uuml;whera mai}
-_texticonopenbook_ [l=mi] {k&auml;tia}
-_texticonpointer_ [l=mi] {w&auml;hanga e tiro ana}
-_texticonhighlight_ [l=mi] {Kia p&uuml;kaha ng&auml; kupu rapu}
-_texticonnohighlight_ [l=mi] {Kia kore he p&uuml;kaha}
-_texticonsmalltext_ [l=mi] {He wh&auml;rangi niupepa}
-_texticonclosedfolder_ [l=mi] {He k&ouml;paki}
+# moved to maori.dm
 
 
@@ -507,9 +451,7 @@
 #######################################################################
 
-
-_texticonsmalltext_ [l=zh] {ãæµè§è¯¥éšä»œææ¬}
-_texticonclosedfolder_ [l=zh] {ãæåŒæ­€æä»¶å€¹ä»¥æµè§ç®åœ}
-_texticondetach_ [l=zh] {ãæåŒäžäžªæ°ççªå£æŸç€ºæ¬é¡µ}
-_texticonexpandtoc_ [l=zh] {ãæ©å±ä¹Šåœè¡š}
-_texticonexpandtext_ [l=zh] {ãæŸç€ºææææ¬}
-_texticonhighlight_ [l=zh] {ãæ¥è¯¢é¡¹ä»¥ç²äœæŸç€º}
+# moved to chinese.dm
+
+
+
+
Index: /trunk/gsdl/macros/english.dm
===================================================================
--- /trunk/gsdl/macros/english.dm	(revision 876)
+++ /trunk/gsdl/macros/english.dm	(revision 876)
@@ -0,0 +1,986 @@
+# all code to do with english
+
+package about
+
+_textabcol_ {About this collection}
+
+_textsubcols1_ {<p>The complete collection comprises _1_ subcollections:
+<blockquote>}
+
+_textsubcols2_ {</blockquote>
+You can check (and alter) which subcollections you are 
+currently using on the Preferences page.}
+
+####################################################################3
+
+package Global
+
+######################
+# default page content
+######################
+
+_textdefaultcontent_ {The requested page could not be found. Please use your browsers 'back' button
+or the above home button to return to the Greenstone Digital Library.}
+_textdefaulttitle_ {GSDL Error}
+
+_collectionextra_ {This collection contains _about:numdocs_ documents. 
+It was last built _about:builddate_ days ago.}
+
+_textimagecollection_ {}
+_textimageabout_ {About page}
+_textimagehome_ {Home page}
+_textimagehelp_ {Help page}
+_textimagepref_ {Preferences page}
+_textimagegreenstone_ {Greenstone Digital Library Software}
+
+_textimagesearch_ {Search for specific terms}
+_textimageTitle_ {Browse alphabetical list of titles}
+_textimageList_ {Browse document listing}
+_textimageCreator_ {Browse alphabetical list of authors}
+_textimageSeries_ {Browse by issue}
+_textimageDate_ {Browse by date}
+_textimageSubject_ {Browse by subject category}
+_textimageOrganization_ {Browse by organization}
+_textimageHowto_ {Browse how to categories}
+_textimageTopic_ {Browse special topic issues}
+_textimageBrowse_ {Browse}
+_textimagePeople_ {Browse alphabetical list of People}
+
+_texticontabsearchgreen_{Search}
+_texticontabdategreen_{Dates}
+_texticontabseriesgreen_{Series}
+_texticontabauthorgreen_{Authors A-Z}
+_texticontabtitlegreen_{Titles A-Z}
+_texticontablistgreen_ {Listing}
+_texticontabsubjectgreen_{Subjects}
+_texticontaborggreen_{Organization}
+_texticontabhowgreen_{How to}
+_texticontabtopicgreen_{Topics}
+_texticontabbrwsegreen_{Browse}
+_texticontabPeoplegreen_{People A-Z}
+
+_texticontext_ {View the document}
+_texticonclosedbook_ {open this document and view contents}
+_texticonnext_ {to next section}
+_texticonprev_ {to previous section}
+
+_page_ {page }
+_of_ { of }
+_vol_ {Volume}
+_num_ {Number}
+
+_textmonth00_ {}
+_textmonth01_ {January}
+_textmonth02_ {February}
+_textmonth03_ {March}
+_textmonth04_ {April}
+_textmonth05_ {May}
+_textmonth06_ {June}
+_textmonth07_ {July}
+_textmonth08_ {August}
+_textmonth09_ {September}
+_textmonth10_ {October}
+_textmonth11_ {November}
+_textmonth12_ {December}
+
+_magazines_ {Magazines}
+
+################
+# from visarts.dm
+###############
+
+_textimageArtist_ {Browse alphabetical list of artists}
+
+_textimageCategory_ {Browse alphabetical list of studio majors}
+
+_texticontabartistgreen_ {Artists}
+
+_texticontabcategorygreen_{Categories}
+
+####################################################################
+
+package document
+
+_textTitlepage_ {_texticonhtitle_}
+_textCreatorpage_ {_texticonhauth_}
+_textSubjectpage_ {_texticonhsubj_}
+_textSeriespage_ {_texticonhser_}
+_textDatepage_ {_texticonhdate_}
+_textHowtopage_ {_texticonhhow_}
+_textOrganizationpage_ {_texticonhorg_}
+_textBrowsepage_ {_texticonhbrwse_}
+_textPeoplepage_ {_texticonhpeople_}
+
+_texticonhtitle_ {Titles A-Z}
+_texticonhauth_ {Authors A-Z}
+_texticonhsubj_ {Subjects}
+_texticonhser_ {Series}
+_texticonhdate_ {Dates}
+_texticonhhow_ {How to}
+_texticonhorg_ {Organizations}
+_texticonhbrwse_ {Browse}
+_texticonhpeople_ {People A-Z}
+
+_texticonopenbookshelf_ {close this section of the library}
+_texticonclosedbookshelf_ {open this section of the library and view contents}
+_texticonopenbook_ {close this book}
+_texticonclosedfolder_ {Open this folder and view contents}
+_texticonclosedfolder2_ {open sub-section: }
+_texticonopenfolder_ {close this folder}
+_texticonopenfolder2_ {close sub-section: }
+_texticonsmalltext_ {View this section of the text}
+_texticonsmalltext2_ {view text: }
+_texticonpointer_ {current section}
+_texticondetach_ {Open this page in a new window}
+_texticonhighlight_ {Highlight search terms}
+_texticonnohighlight_ {Don't highlight search terms}
+_texticoncontracttoc_ {Collapse table of contents}
+_texticonexpandtoc_ {Expand table of contents}
+_texticonexpandtext_ {Display all text}
+_texticoncontracttext_ {Display text only for currently selected section}
+_texticonwarning_ {<b>Warning: </b>}
+_texticoncont_ {continue?}
+
+_textltwarning_ {
+<p><center>
+<table cellspacing=0 cellpadding=0 width=_pagewidth_>
+<tr valign=top><td>_iconwarning_Expanding the text here will generate a large 
+amount of data for your browser to display _imagecont_
+</td></tr></table></center>
+}
+
+################
+# from visarts.dm
+###############
+
+_texticonhartst_ {Artists}
+_texticonhcat_ {Categories}
+
+
+######################################################################
+
+package home
+
+_documents_ { documents. }
+_lastupdate_ {Last updated}
+_ago_ {days ago.}
+_colnotbuilt_ {Collection not built.}
+
+
+_textpeople_ {People}
+_textfb_ {Feedback}
+_textpub_ {Publications}
+_texttec_ {Technology}
+_textrw_ {Related Work}
+_textinfosheet_ {Info Sheet}
+_textscreenshots_ {Screen Shots}
+_textnpepainfosheet_ {Niupepa Info Sheet}
+_textpagetitle_ {Greenstone Digital Library}
+_textprojhead_ {The New Zealand Digital Library Project}
+
+_textprojinfo_ {
+<h4>The NZDL system</h4>
+
+<p> The New Zealand Digital Library system comprises several demonstration
+collections -- computer science technical reports and bibliographies, literary
+works, humanitarian and development information, magazines -- and makes them
+available over the Web through full-text interfaces.  Behind the query
+interface lies a huge collection providing gigabytes of information.  We hope
+you find what you want, or at least something intriguing!
+
+<h4>The Greenstone software</h4>
+
+<p> The Greenstone Digital Library software provides a new way of organizing
+information and making it available over the Internet.  A <i>collection</i> of
+information comprises several (typically several thousand, or even several
+million) <i>documents</i>, which share a uniform searching and browsing
+interface.  The collections in a library are organized in a different
+way--though they share a strong family resemblance.  Although primarily
+designed for access over the Web, Greenstone collections can be made available,
+in precisely the same form, on CD-ROM for standalone PCs.  Greenstone is
+open-source software, available under the terms of the Gnu public linense.
+ 
+<h4>The research</h4>
+
+<p> The goal of our research program is to explore the potential of
+internet-based digital libraries.  Our vision is to develop systems that
+automatically impose structure on anarchic, uncatalogued, distributed
+repositories of information, thereby providing information consumers with
+effective tools to locate what they need and to peruse it conveniently and
+comfortably.  Our research objectives are to
+
+<ul>
+  <li> develop technology for creating and automatically
+      maintaining collections;
+  <li> monitor usage to study library users' needs;
+  <li> look at novel interfaces that cater to a wide spectrum of users;
+  <li> find ways to abstract layout and bibliographic information
+      from document files;
+  <li> use this information to enhance presentation and for
+      bibliometric research;
+  <li> assess potential subject areas for public-domain collections;
+  <li> survey and critique other digital library projects.
+</ul>
+}
+
+_textotherinfo_ {
+<table border=0 cellpadding=5><tr valign=top>
+<td width=50%>
+<h4>Global Help Projects vzw</h4>
+
+<a href="http://www.globalprojects.org">Global Help Projects</a> is a registered
+charity responsible for the Humanity Libraries Project
+that provides universal low-cost information access through co-operation
+between UN Agencies, universities and NGOs.
+Global Help Projects collaborate extensively with the NZDL 
+project, and use the Greenstone software.
+</td><td width=50%>
+<h4>DigiLib Systems Limited</h4>
+
+<p><a href="http://www.digilibs.com/">DigiLib Systems Limited</a> is an
+innovative software company that creates international digital libraries.
+As a major contributor to the Greenstone Digital Library Software they are
+able to build, customize, and extend digital libraries to meet exacting needs.
+Please <a href="mailto:contact@digilibs.com">contact</a> them for an obligation
+free quote.
+</td></tr></table>
+}
+
+_textpoem_ {
+<br><h2 align=left>Kia papapounamu te moana</h2>
+
+        <p>kia hora te marino,
+        <br>kia tere te karohirohi,
+        <br>kia papapounamu te moana
+
+        <p>may peace and calmness surround you,
+        <br>may you reside in the warmth of a summer's haze,
+        <br>may the ocean of your travels be as smooth as the polished greenstone.
+}
+
+_textgreenstone_ {
+<p><br>
+Greenstone is a semi-precious stone that (like this software) is sourced in
+New Zealand.  In traditional Maori society it was the most highly prized and
+sought after of all substances.  It can absorb and hold <i>wairua</i>, which is
+a spirit or life force, and is endowed with traditional virtues that make it an
+appropriate emblem for a public-domain digital library project.  Its lustre
+shows charity; its translucence, honesty; its toughness, courage; and the sharp
+edge it can take, justice.  The carved piece used in the Greenstone Digital
+Library Software logo is a <i>patu</i> or fighting club, and is a family
+heirloom of one of our project members.  In hand-to-hand combat its delivery is
+very quick, very accurate, and very complete.  We like to think these qualities
+also apply to our software, the razor sharp edge of the <i>patu</i> symbolizing
+the leading edge of technology.
+
+<p><a href="mailto:greenstone@cs.waikato.ac.nz">Greenstone Digital Library Software</a>
+<br><a href="http://www.cs.waikato.ac.nz/cs">Computer Science Department</a>, 
+<a href="http://www.waikato.ac.nz">University of Waikato</a>, New Zealand
+
+<br>October 1999
+}
+
+#######################################################################
+package help
+
+_textHelp_ {Help}
+_textSearchshort_ {search for particular words}
+_textSeriesshort_ {access publications by series}
+_textDateshort_ {access publications by date}
+_textSubjectshort_ {access publications by subject}
+_textTitleshort_ {access publications by title}
+_textBrowseshort_ {browse publications}
+_textCreatorshort_ {access publications by author}
+_textOrganizationshort_ {access publications by organization}
+_textHowtoshort_ {access publications by how to listing}
+_textTopicshort_ {access publications by topic}
+_textPeopleshort_ {access publications by people}
+_textdefaultshorttext_ {undefined classification}
+
+_textSearchlong_ {
+<p>You can <i>search for particular words</i> that appear in the text from the
+"search" page. This is the first page that comes up when you begin, and can be
+reached from other pages by pressing the <i>search</i> button.
+}
+
+_textTitlelong_ {
+<p>You can <i>access publications by title</i> by pressing the <i>titles a-z</i>
+button.  This brings up a list of books in alphabetic order.
+}
+
+_textOrganizationlong_ {
+<p>You can <i>access publications by organization</i> by pressing the <i>organization</i>
+button.  This brings up a list of organizations.
+}
+
+_textHowtolong_ {
+<p>You can <i>access publications by how to listing</i> by pressing the <i>how to</i>
+button.  This brings up a list of how to strings.
+}
+
+_textCreatorlong_ {
+<p>You can <i>access publications by author</i> by pressing the <i>authors a-z</i>
+button.  This brings up a list of books, sorted by author name.
+}
+
+_textTopiclong_ {
+<p>You can <i>access publications by topic</i> by pressing the <i>topic</i>
+button.  This brings up a list of topics to browse.
+}
+
+_textSubjectlong_ {
+<p>You can <i>access publications by subject</i> by pressing the <i>subjects</i>
+button.  This brings up a list of subjects, represented by bookshelves.
+}
+
+_textSerieslong_ {
+<p>You can <i>access publications by series</i> by pressing the <i>series</i> button. 
+This brings up a list of those series which are currently in the collection. 
+}
+
+_textDatelong_ {
+<p>You can <i>access publications by date</i> by pressing the <i>dates</i> button. 
+This brings up a list of all the issues, sorted chronologically.
+}
+
+_textBrowselong_ {
+<p>You can <i>browse publications</i> by pressing the <i>browse</i> button.
+}
+
+_textPeoplelong_ {
+<p>You can <i>access publications by people</i> by pressing the 
+   <i>people a-z</i> button.  This brings up a list of entries, sorted by 
+     surname.
+}
+
+_textdefaultlongtext_ {
+<p>Click on the <i>unknown</i> button to browse publications (listing is sorted
+by an unknown field).
+}
+
+_texthelptopics_ {
+<h2 align=left>Topics</h2>
+<ul>
+  <li><a href="\#finding-information">_textsimplehelpheading_</a>
+  _topicreadingdocs_
+  <li><a href="\#searching">How to search for particular words</a>
+<ul>
+  <li><a href="\#query-terms">Search terms</a>
+  <li><a href="\#query-type">Query type</a>
+  <li><a href="\#scope-of-queries">Scope of queries</a>
+</ul>
+  <li><a href="\#preferences">_textchangeprefs_</a>
+<ul>
+  <li><a href="\#col-prefs">Collection preferences</a>
+  <li><a href="\#pres-prefs">Presentation preferences</a>
+  <li><a href="\#search-prefs">Search preferences</a>
+</ul>
+</ul>
+}
+
+# there are 4 versions of this section of the help text.
+# which version is used is currently set within the server
+# (it should probably use the macro language e.g. [type=book])
+# 1 = html (like fao collections) -- section is empty
+# 2 = book (like hdl collection) -- macros beginning with book
+# 3 = bibliographic (like csbib) -- macros beginning with bib
+# 4 = standard (like gberg) -- the default
+
+_topicreadingdocs_ {<li><a href="\#reading-docs">_textreadingdocs_</a>}
+
+_textreadingdocs_ {How to read the documents}
+_booktextreadingdocs_ {How to read the books}
+_bibtextreadingdocs_ {Getting more information on a bibliography item}
+
+_texthelpreadingdocs_ {
+<p>_iconblankbar_
+<a name=reading-docs>
+<h2>_textreadingdocs_</h2>
+
+<p>You can tell when you have arrived at an individual document because
+its title and author appear at the top left of the page. Beside these
+is the number of the current page, a box that allows you to select a
+new page, and forward and backward arrows.
+
+<p>Underneath is the text of the current section. When you have read
+through it, there are arrows at the bottom to take you on to the next
+section or back to the previous one.
+
+<p>Below the title and author are three buttons. Click on <i>expand
+text</i> to expand out the whole text of the current document. If the
+document is large, this could take a long time and use a lot of memory!
+Click on <i>detach</i> to make a new browser window for this
+document. (This is useful if you want to compare documents, or read two
+at once.)  Finally, when you do a search the words you search for are
+highlighted.  Click on <i>no highlighting</i> to remove the highlighting.
+<p>
+<table cellspacing="0" cellpadding="2" border="0">
+<tr><td colspan=2><img src="_httpiconmore_" border="0"></td><td>Click on the arrow to go to the next section ...</td></tr>
+<tr><td colspan=2><img src="_httpiconless_" border="0"></td><td>... or back to the previous section</td></tr>
+<tr><td><img src="_document:httpiconealltof_" border="0"></td><td><img 
+src="_document:httpiconetsecof_" border="0"></td><td>Display all text, or not</td></tr>
+<tr><td colspan=2><img src="_document:httpiconedtchof_" border="0"></td><td>Open this page in a new window</td></tr>
+<tr><td><img src="_document:httpiconehlof_" border="0"></td><td><img
+src="_document:httpiconenhlof_" border="0"></td><td>Highlight search terms, or not</td></tr>
+</table>
+
+}
+
+_booktexthelpreadingdocs_ {
+<p>_iconblankbar_
+<a name=reading-docs>
+<h2>_textreadingdocs_</h2>
+
+<p>You can tell when you have arrived at an individual book because there is a
+photograph of its front cover at the top left of the page.  Beside the photograph 
+is a table of contents with an arrow marking where you are.  This table is 
+expandable: click on the folders to open them or close them.  Click on the open 
+book at the top to close it.
+
+<p>Underneath is the text of the current section.  When you have read through
+it, there are arrows at the bottom to take you on to the next section or back
+to the previous one.
+
+<p>Below the photograph are four buttons.  Click on <i>detach</i> to make a
+new browser window for this book.  (This is useful if you want to compare
+books, or read two at once.)  Click on <i>expand contents</i> to expand out the
+whole table of contents so that you can see the titles of all chapters and
+subsections.  Click on <i>expand text</i> to expand out the whole text of the
+current section, or book.  If the book is large, this could take a long time
+and use a lot of memory! Finally, when you do a search the words you search
+for are highlighted. Click on <i>no highlighting</i> to remove highlighting.
+<p>
+<table cellspacing="0" cellpadding="2" border="0">
+<tr><td colspan=2><img src="_httpiconbshelf_" border="0"></td><td>Open/close this bookshelf</td></tr>
+<tr><td><img src="_httpiconopenbook_" border="0"></td><td><img 
+src="_httpiconbook_" border="0"></td><td>Open/close this book</td></tr>
+<tr><td colspan=2><img src="_httpiconitext_" border="0"></td><td>View this section of the text</td></tr>
+<tr><td><img src="_document:httpiconealltof_" border="0"></td><td><img 
+src="_document:httpiconetsecof_" border="0"></td><td>Display all text, or not</td></tr>
+<tr><td><img src="_document:httpiconeexpcof_" border="0"></td><td><img
+src="_document:httpiconeconcof_" border="0"></td><td>Expand table of contents, or not</td></tr>
+<tr><td colspan=2><img src="_document:httpiconedtchof_" border="0"></td><td>Open this page in a new window</td></tr>
+<tr><td><img src="_document:httpiconehlof_" border="0"></td><td><img
+src="_document:httpiconenhlof_" border="0"></td><td>Highlight search terms, or not</td></tr>
+<tr><td colspan=2><img src="_httpiconmore_" border="0"></td><td>Click on the arrow to go to the next section ...</td></tr>
+<tr><td colspan=2><img src="_httpiconless_" border="0"></td><td>... or back to the previous section</td></tr>
+</table>
+}
+
+_bibtexthelpreadingdocs_ {
+<p>_iconblankbar_
+<a name=reading-docs>
+<h2>_textreadingdocs_</h2>
+
+<p>Some bibliography items contain more information, such as an abstract.
+You can tell from the query response page if this is the case because they 
+are shown with the _icontext_ icon instead of the _iconblanktext_ icon.
+
+<p>Clicking on the _icontext_ icon will give you more information about the
+bibliography item.
+
+<p> Below the bibliography item are two buttons. Click on <i>detach</i> to 
+make a new browser window for this book. (This is useful if you want to compare
+bibliography items.) Finally, when you do a search the words you search for are 
+highlighted. Click on <i>no highlighting</i> to remove the highlighting.
+
+<p>
+<table cellspacing="0" cellpadding="2" border="0">
+<tr><td colspan=2><img src="_document:httpiconedtchof_" border="0"></td><td>Open this page in a new window</td></tr>
+<tr><td><img src="_document:httpiconehlof_" border="0"></td><td><img
+src="_document:httpiconenhlof_" border="0"></td><td>Highlight search terms, or not</td></tr>
+</table>
+}
+
+_texthelpsearching_ {
+<h2>How to search for particular words</h2>
+<p>
+  From the search page, you make a query in these simple steps:<p>
+  
+  <ol><li>Specify what documents you want to search
+      <li>Say whether you want to search for all or just some of the words
+      <li>Type in the words you want to search for
+      <li>Click the <i>Begin Search</i> button
+  </ol>
+
+<p>When you make a query, the titles of twenty matching documents will be shown.
+There is a button at the end to take you on to the next twenty documents.  From
+there you will find buttons to take you on to the third twenty or back to the
+first twenty, and so on.  Click the title of any document, or the little button
+beside it, to see it.
+
+<p>A maximum of 100 is imposed on the number of
+  documents returned.  You can change this number by clicking the
+  <i>preferences</i> button at the top of the page.<p>
+
+<p>_iconblankbar_
+<a name=query-terms>
+<h3>Search terms</h3>
+
+<p>Whatever you type into the query box is interpreted as a list of words
+called "search terms."  Each term contains nothing but alphabetic characters
+and digits.  Terms are separated by white space.  If any other characters such
+as punctuation appear, they serve to separate terms just as though they were
+spaces.  And then they are ignored.  You can't search for words that include
+punctuation.
+
+<p>For example, the query<p>
+    <ul><kbd>Agro-forestry in the Pacific Islands: Systems for Sustainability (1993)</kbd></ul>
+      <p>will be treated the same as<p>
+      <ul><kbd>Agro forestry in the Pacific Islands  Systems for Sustainability  1993 </kbd></ul><p>
+
+<p>_iconblankbar_
+<a name=query-type>
+<h3>Query type</h3>
+
+<p>There are two different kinds of query.
+
+<ul>
+  <li>Queries for <b>all</b> of the words.  These look for documents that 
+      contain all the words you have specified.  Documents that satisfy the
+      query are displayed, in alphabetical order.<p>
+
+  <li>Queries for <b>some</b> of the words.  Just list some terms that are
+      likely to appear in the documents you are looking for.  Documents are
+      displayed in order of how closely they match the query.  When determining
+
+      the degree of match,
+
+      <p><ul>
+        <li> the more search terms a document contains, the closer it matches;
+        <li> rare terms are more important than common ones;
+        <li> short documents match better than long ones.
+      </ul>
+</ul>
+
+<p>Use as many search terms as you like--a whole sentence, or even a
+whole paragraph.  If you specify only
+one term, documents will be ordered by its frequency of occurrence.<p>
+_texthelpscope_
+}
+
+_textchangeprefs_ {Changing your preferences}
+
+_texthelppreferences_ {<h2>_textchangeprefs_</h2>
+
+<p>When you click the <i>preferences</i> button at the top of the page you will
+be able to change some features of the interface to suit your own requirements.
+
+<p>_iconblankbar_
+<a name=col-prefs>
+<h3 align=left>Collection preferences</h3>
+
+Some collections comprise several subcollections, which can be searched
+independently or together, as one unit.  If so, you can select which
+subcollections to include in your searches on the Preferences page.
+
+<p>_iconblankbar_
+<a name=pres-prefs>
+<h3 align=left>Presentation preferences</h3>
+
+Depending on the particular collection, there may be several options you can
+set that control the presentation.
+
+Collections of Web pages allow you to suppress the Greenstone navigation bar at
+the top of each document page, so that once you have done a search you land at
+the exact Web page that matches without any Greenstone header.  To do another
+search you will have to use your browser's "back" button.  These collections
+also allow you to suppress Greenstone's warning message when you click a link
+that takes you out of the digital library collection and on to the Web itself.
+And in some Web collections you can control whether the links on the "Search
+Results" page take you straight to the actual URL in question, rather than to
+the digital library's copy of the page.
+
+Collections that are capable of being presented in different languages allow
+you to specify the interface language.  If the language is Chinese, you can
+also specify which of the standard Chinese encodings your browser uses.
+
+Finally, all collections allow you to switch to a textual interface format
+rather than the standard graphical one.  This is particularly useful for
+visually impaired users who use large screen fonts or speech synthesizers for
+output.
+
+<p>_iconblankbar_
+<a name=search-prefs>
+<h3 align=left>Search preferences</h3>
+Two pairs of buttons control the case sensitivity and stemming of the searches
+that you make. The first set of buttons controls whether upper and lower case
+must match (case sensitivity).  The second set controls whether to ignore word
+endings or not (stemming).
+
+<p>For example, if the buttons <i>ignore case differences</i> and
+<i>ignore word endings</i> are selected, the query<p>
+    <ul><kbd>African building</kbd></ul>
+      <p>will be treated the same as<p>
+      <ul><kbd>africa builds</kbd></ul><p>
+      because the uppercase letter in "African" will be transformed to
+      lowercase, and  the suffixes "n" and "ing" will be removed from
+      "African" and "building" respectively (also, "s" would be removed from
+      "builds").
+}
+
+_texttanumbrowseoptions_ {There are _numbrowseoptions_ ways to find information in this collection:}
+
+_textsimplehelpheading_ {How to find information}
+
+_texthelpscope_ {
+<p>_iconblankbar_
+<a name=scope-of-queries>
+<h3 align=left>Scope of queries</h3>
+
+<p>
+In most collections you can choose different indexes to search. For example, there might
+be author or title indexes. Or there might be chapter or paragraph indexes. Generally,
+the full matching document is returned regardless of which index you search.
+<p>If documents are books, they will be opened at the appropriate place.
+}
+
+####################################################################
+
+package query
+
+_textquerytitle_ {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargq_,No matches for query: _cgiargq_}
+_textnoquerytitle_ {Search page}
+
+_texticonthispage_ {search}
+_textsome_ {_If_(_cgiargb_,ranked,some)}
+_textall_ {_If_(_cgiargb_,boolean,all)}
+_texticonqueryresultsbar_ {}
+_textfreqmsg1_ {Word count: }
+_textpostprocess_ {_If_(_quotedquery_,<br><i>post-processed to find _quotedquery_</i>
+)}
+
+_textmorethan_ {More than }
+_textapprox_ {About }
+_textnodocs_ {No documents matched the query.}
+_text1doc_ {1 document matched the query.}
+_textlotsdocs_ {documents matched the query.}
+_textmatches_ {Matches }
+_textbeginsearch_ {Begin Search}
+
+# the textselect macro may need to be overridden for some collections
+# _hselection_, _jselection_ and _nselection_ are set from within the server
+# some or all of them may remain unset
+_textselect_ {_If_(_cgiargb_,_textadvancedsearch_,_textsimplesearch_)}
+
+_defaultindextext_ { all text }
+_textsimplesearch_ {Search for _If_(_hselection_, _hselection_, _defaultindextext_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) 
+which contain _querytypeselection_ of the words}
+
+_textadvancedsearch_ {Search_If_(_hselection_, _hselection_, _defaultindextext_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) 
+using _querytypeselection_ query}
+
+_textjselect_ {_If_(_hselection_, of) _jselection_}
+
+_querytypeselection_ {
+<select name="t">
+<option value="1"_If_(_cgiargt_, selected)>_textsome_
+<option value="0"_If_(_cgiargt_,, selected)>_textall_
+</select>
+}
+
+_textstemon_ { (ignoring word endings)}
+
+
+############################################################################
+
+package preferences
+
+_textsearchprefs_ {Search preferences}
+_textcollectionprefs_ {Collection preferences}
+_textpresentationprefs_ {Presentation preferences}
+_textpreferences_ {Preferences}
+_textignorecase_ { ignore case differences}
+_textmatchcase_ { upper/lower case must match}
+_textstem_ { ignore word endings}
+_textnostem_ { whole word must match}
+_textprefop_ {Return up to _maxdocoption_ hits with _hitsperpageoption_ hits per page.}
+_textextlink_ {Access to external Web pages: }
+_textintlink_ {Source documents retrieved from:}
+_textlanguage_ {Interface language: }
+_textencoding_ {Encoding: }
+_textformat_ {Interface format: }
+_textall_ {all}
+_textsimplemode_ {simple query mode}
+_textadvancedmode_ {advanced query mode (allows boolean searching using !, &, |, and parentheses)}
+_textlinkinterm_ {through intermediate page}
+_textlinkdirect_ {go directly there}
+_textdigitlib_ {the digital library}
+_textweb_ {the web}
+_textlangeng_ {English}
+_textlangmaori_ {M&auml;ori}
+_textlangchinese_ {Chinese}
+_textgraphical_ {Graphical}
+_texttextual_ {Textual}
+_textcollectionoption_ {<p>
+Subcollections to include:
+<br>}
+_textfcoption_ {Include navigation bar at top of document pages}
+_texthloption_ {Highlight search terms within document text}
+
+################################################################################
+
+package people
+
+_textpagetitle_ {NZDL: People}
+
+_textsmallrs_ {Related Staff}
+
+_textsawnzdl_ {Staff associated with the New Zealand Digital Library 
+	project are:}
+_texttrsaawp_ {These research students and software support people are associated with the project:}
+
+_textstafftable_ {
+<table>
+<tr>
+  <td align=right valign=top width=100><a href="http://www.cs.waikato.ac.nz/~ihw">Ian Witten</a></td>
+  <td _1_ align=left valign=top>Project leader; co-author of <a href="http://www.cs.mu.oz.au/mg/"><i>Managing Gigabytes</i></a></td>
+</tr>
+<tr>
+  <td align=right valign=top><a href="http://www.cs.waikato.ac.nz/cs/Staff/mark-d.-apperley-.html">Mark Apperley</a></td>
+  <td _1_ align=left valign=top>User interfaces for readers</td>
+</tr>
+<tr>
+  <td align=right valign=top><a href="http://www.cs.waikato.ac.nz/cs/Staff/david-bainbridge.html">David Bainbridge</a></td>
+  <td _1_ align=left valign=top>Musical and Web-based collections; optical music recognition</td>
+</tr>
+<tr>
+  <td align=right valign=top><a
+href="http://www.cs.waikato.ac.nz/cs/Staff/sally-jo-cunningham.html">Sally Jo Cunningham</a></td>
+  <td _1_ align=left valign=top>Collections and usage studies</td>
+</tr>
+<tr>
+  <td align=right valign=top><a href="http://www.cs.waikato.ac.nz/cs/Staff/steve-jones.html">Steve Jones</a></td>
+  <td _1_ align=left valign=top>Phrase-based interfaces, collaborative browsing, usage analysis</td>
+</tr>
+<tr>
+  <td align=right valign=top><a
+  href="http://www.cs.waikato.ac.nz/cs/Staff/te-taka-keegan.html">Te Taka Keegan
+  </a></td> 
+  <td _1_ align=left valign=top>Maori language systems</td>
+</tr>
+  <td align=right valign=top><a
+  href="http://www.cs.waikato.ac.nz/Staff/malika-mahoui.html">Malika
+  Mahoui</a></td> 
+  <td _1_ align=left valign=top>Text mining, Arabic interfaces</td>
+</tr>
+</table>
+}
+
+_textgstable_ {
+<table>
+<tr>
+  <td align=right valign=top>George Buchanan</a></td>
+  <td _1_ align=left valign=top>Systems support</td>
+</tr>
+<tr>
+  <td align=right valign=top><a href="http://www.cs.waikato.ac.nz/~sjboddie">Stefan Boddie</a></td>
+  <td _1_ align=left valign=top>Systems support</td>
+</tr>
+<tr>
+  <td align=right valign=top><a href="http://www.cs.waikato.ac.nz/~rjmcnab">Rodger McNab</a></td>
+  <td _1_ align=left valign=top>Systems support</td>
+</tr>
+<tr>
+  <td align=right valign=top>YingYing Wen</a></td>
+  <td _1_ align=left valign=top>Text mining, Chinese libraries</td>
+</tr>
+<tr>
+  <td align=right valign=top>Stuart Yeates</a></td>
+  <td _1_ align=left valign=top>Text mining, acronym extraction</td>
+</tr>
+</table>
+}
+
+_textsmallcont_ {Other Contributors}
+_texttpcsp_ {These people have contributed strongly to the project:}
+
+_textconttable_ {
+<table>
+<tr>
+  <td align=right valign=top width=100>Mark Abrahams</td>
+  <td _1_ align=left valign=top>Client-side browsing interfaces using Java</td>
+</tr>
+<tr>
+  <td align=right valign=top width=100><a href="http://www.cosc.canterbury.ac.nz/~tim">Tim Bell</a></td>
+  <td _1_ align=left valign=top>Co-author of <a href="http://www.cs.mu.oz.au/mg/"><i>Managing Gigabytes</i></a></td>
+</tr>
+<tr>
+  <td align=right valign=top>Matt Humphrey</td>
+  <td _1_ align=left valign=top>Information visualization in the digital library</td>
+</tr>
+<tr>
+  <td align=right valign=top><a
+href="http://www.cs.waikato.ac.nz/~singlis">Stuart Inglis</a></td>
+  <td _1_ align=left valign=top>Document image analysis and optical character recognition</td>
+</tr>
+<tr>
+  <td align=right valign=top>Trent Mankelow</a></td>
+  <td _1_ align=left valign=top>School Journal prototype</td>
+</tr>
+<tr>
+  <td align=right valign=top><a href="http://www.cosc.canterbury.ac.nz/~bruce">Bruce McKenzie</a></td>
+  <td _1_ align=left valign=top>Original interface to MG</td>
+</tr>
+<tr>
+  <td align=right valign=top><a href="http://www.cs.mu.oz.au/~alistair">Alistair Moffat</a></td>
+  <td _1_ align=left valign=top>Co-author of <a href="http://www.cs.mu.oz.au/mg/"><i>Managing Gigabytes</i></a>,
+created the MG software</td>
+</tr>
+<tr>
+  <td align=right valign=top>Todd Reed</td>
+  <td _1_ align=left valign=top>PostScript to text conversion, user interface, WWW server, index building, FTP</td>
+</tr>
+<tr>
+  <td align=right valign=top><a
+href="http://www.cs.waikato.ac.nz/cs/Staff/don-a.-smith.html">Don Smith</a></td>
+  <td _1_ align=left valign=top>Special needs of libraries for mathematical and theoretical materials</td>
+</tr>
+<tr>
+  <td align=right valign=top>Che Tamahori</td>
+  <td _1_ align=left valign=top>Designer of New Zealand Digital Library Web
+  pages</td>
+</tr>
+<tr>
+  <td align=right valign=top><a
+href="http://www.cs.waikato.ac.nz/~wjt">Bill Teahan</a></td>
+  <td _1_ align=left valign=top>Language modeling</td>
+</tr>
+<tr>
+  <td align=right valign=top>Mahendra Vallabh</td>
+  <td _1_ align=left valign=top>Original FTP script</td>
+</tr>
+<tr>
+  <td align=right valign=top><a
+href="http://www.cs.waikato.ac.nz/cs/Staff/lloyd-a.-smith.html">Lloyd Smith</a></td>
+  <td _1_ align=left valign=top>Music collections and music retrieval</td>
+</tr>
+<tr>
+  <td align=right valign=top>John Venable</td>
+  <td _1_ align=left valign=top>Requirements for digital libraries, and collections for information systems</td>
+</tr>
+</table>
+}
+
+_textaffiliates_ {There are several affiliates at other universities:}
+
+_textaffiliatetable_ {
+<table>
+<tr>
+  <td align=right valign=top>Elke Duenker</td>
+  <td _1_ align=left valign=top>Cross-cultural issues</td>
+</tr>
+<tr>
+  <td align=right valign=top><a href="http://www.cs.waikato.ac.nz/~cgn/
+">Craig Nevill-Manning</a></td>
+  <td _1_ align=left valign=top>PostScript to text conversion, user
+interface, WWW server, index
+building, FTP</td>
+</tr>
+<tr>
+  <td align=right valign=top>Nina Reeves</td>
+  <td _1_ align=left valign=top>Librarians and library users</td>
+</tr>
+<tr>
+  <td align=right valign=top>Yin Leng Theng</td>
+  <td _1_ align=left valign=top>Digital libraries for schools</td>
+</tr>
+<tr>
+  <td align=right valign=top>Harold Thimbleby</td>
+  <td _1_ align=left valign=top>User interfaces for digital
+libraries</td>
+</tr>
+</table>
+}
+
+############################################################################
+
+package technology
+
+_textpagetitle_ {NZDL: Technology}
+
+
+############################################################################
+
+package status
+
+_textframebrowser_ {You must have a frame enabled browser to view this.}
+_textusermanage_ {User management}
+_textlistusers_ {list users}
+_textaddusers_ {add a new user}
+
+_textinfo_ {Information}
+_textgeneral_ {general}
+_textarguments_ {arguments}
+_textactions_ {actions}
+_textprotocols_ {protocols}
+
+_textcollections_ {Collections}
+_textnewcoll_ {new collection}
+_texteditcoll_ {edit collection}
+_textbuildcoll_ {build collection}
+_textdeletecoll_ {delete collection}
+
+_textlogs_ {Logs}
+_textinitlog_ {init log}
+_texterrorlog_ {error log}
+
+_textreturnhome_ {Return to home page}
+
+_titlewelcome_ { Maintenance and Administration }
+
+_welcome_ {
+
+<p> Maintenance and administration services available include:
+	view on-line logs; 
+	create, maintain and update collections; 
+	and access technical information such as CGI arguments.  
+	These services are accessed using the
+	side navigation bar on the lefthand side of the page.
+}
+
+########################################################################
+
+package html
+
+_textframebrowser_ {You must have a frame enabled browser to view this.}
+
+########################################################################
+
+package extlink
+
+_textextlink_ {External Link}
+_textlinknotfound_{Internal Link not Found}
+
+_textextlinkcontent_ {The link you have selected is external to any of your currently selected collections.
+    If you still wish to view this link and your browser has access to 
+    the Web, you can <a href="_nexturl_">go forward</a> to this page; otherwise 
+    use your browsers "back" button to return to the previous document.}
+
+_textlinknotfoundcontent_ {For reasons beyond our control, the internal link you have selected 
+    does not exist.  This is probably due to an error in the source collection.
+    Use your browsers "back" button to return to the previous document.}
+
+
+#########################################################################
+
+package authen
+
+_textGSDLtitle_ {Greenstone Digital Library}
+
+_textusername_ {username}
+_textpassword_ {password}
+
+_textmessageinvalid_ {The page you have requested requires you to sign in.
+Please enter your username and password.}
+
+_textmessagefailed_ {Either your user name or password was incorrect.}
+
+_textmessagedisabled_ {Sorry, your account has been disabled. Please contact
+the webmaster for this site.}
+
+_textmessagepermissiondenied_ {Sorry, you do not have permission to access this page.}
+
+_textmessagestalekey_ {The link you have followed is now stale. 
+Please enter your password to access this page.}
+
Index: /trunk/gsdl/macros/extlink.dm
===================================================================
--- /trunk/gsdl/macros/extlink.dm	(revision 875)
+++ /trunk/gsdl/macros/extlink.dm	(revision 876)
@@ -1,63 +1,31 @@
 package extlink
 
-_iconforward_{<img src="_httpiconmore_" align=absbottom 
-width=_widthmore_ height=_heightmore_ border=0 alt="_texticonforward_">}
-_iconforward_[v=1] {_texticonforward_}
-
-_iconbackward_{<img src="_httpiconless_" align=absbottom 
-width=_widthless_ height=_heightless_ border=0 alt="_texticonbackward_">}
-_iconbackward_[v=1] {_texticonbackward_}
-
-_texticonforward_ {forward to external page}
-_texticonbackward_ {back to previous page}
-
-_nexturl_ {}
-_prevdoc_ {}
+_header_ {_htmlhead_}
 
 _foundcontent_ {
 
-<h3>External link</h3>
+<h3>_textextlink_</h3>
 
-<p> The link you have selected is external to the _collectionname_
-    collection.
-    If you still wish to view this link and your browser has access to 
-    the Web, you can go 
-    <a href="_nexturl_">forward</a> to this page; otherwise you can go
-    <a href="_httpdocument_&cl=_cgiargcl_&d=_prevdoc_">back</a> 
-    to the previous document.
+<p> _textextlinkcontent_
+}
 
-<p>
-<center>
-   <table>
-     <tr align=absbottom>
-	<td><a href="_httpdocument_&cl=_cgiargcl_&d=_prevdoc_">_iconbackward_</a></td>
-	<td><a href="_httpdocument_&cl=_cgiargcl_&d=_prevdoc_">Back</a></td>
-        <td><a href="_nexturl_">Forward</a></td>
-	<td><a href="_nexturl_">_iconforward_</a></td>
-     </tr>
-   </table>
-</center>
+# should have arguments of collection, collectionname and link
+_foundintcontent_ {
 
+<h3>Link to "_2_" collection</h3>
+
+<p> The link you have selected is external to the "_collectionname_"
+    collection (it links to the "_2_" collection).
+    If you wish to view this link in the "_2_" collection you can 
+    <a href="_httpdoc_&c=_1_&cl=_cgiargcl_&d=_3_">go forward</a> to this page; 
+    otherwise use your browsers "back" button to return to the previous document.
 }
 
 _notfoundcontent_ {
 
-<h3>Internal link not found</h3>
+<h3>_textlinknotfound_</h3>
 
-<p> For reasons beyond our control, the internal link you have selected 
-    does not exist.  This is most
-    probably due to an error in the source collection.
-    Click <a href="_httpdocument_&cl=_cgiargcl_&d=_prevdoc_">back</a> 
-    to return to the previous document.
+<p> _textlinknotfoundcontent_
+}
 
-<p>
-<center>
-   <table>
-     <tr align=absbottom>
-	<td><a href="_httpdocument_&cl=_cgiargcl_&d=_prevdoc_">_iconbackward_</a></td>
-	<td><a href="_httpdocument_&cl=_cgiargcl_&d=_prevdoc_">Back</a></td>
-     </tr>
-   </table>
-</center>
 
-}
Index: /trunk/gsdl/macros/gsdlsoft.dm
===================================================================
--- /trunk/gsdl/macros/gsdlsoft.dm	(revision 876)
+++ /trunk/gsdl/macros/gsdlsoft.dm	(revision 876)
@@ -0,0 +1,64 @@
+package gsdlsoft
+
+
+#######################################################################
+# java images/scripts
+#######################################################################
+
+# the _javalinks_ macros are the flashy image links at the top right of
+# the page. 
+
+_javalinks_ {_imagehome_}
+_javalinks_ [v=1] {
+_imagehome_<br>
+}
+
+#######################################################################
+# page content
+#######################################################################
+
+_pagetitle_ {NZDL: Greenstone Digital Library Software}
+
+_imagethispage_ {_imagegreenstone_}
+
+_content_ {
+_iconblankbar_
+
+<h4>The Greenstone software</h4>
+
+<p> The Greenstone Digital Library software provides a new way of organizing
+information and making it available over the Internet.  A <i>collection</i> of
+information comprises several (typically several thousand, or even several
+million) <i>documents</i>, which share a uniform searching and browsing
+interface.  The collections in a library are organized in a different
+way--though they share a strong family resemblance.  Although primarily
+designed for access over the Web, Greenstone collections can be made available,
+in precisely the same form, on CD-ROM for standalone PCs.  Greenstone is
+open-source software, available under the terms of the Gnu public linense.
+
+<h4>Installing Greenstone</h4>
+
+<p> To install on unix systems:
+
+<ul>
+<li>Download the <a href="http://www.nzdl.org/technology/gsdl-2.11.tar.gz"><i>gsdl-2.11</i></a> distribution.
+<li>Extract the gzipped tar archive (tar xvzf gsdl-2.11.tar.gz)
+<li>In the resulting gsdl directory type "./configure". When the configure script has finished running type
+"make", then "make install".
+<li>"make install" copies the compiled executable file into the top level gsdl directory by default. To
+run the library as a cgi script move the executable to your cgi-bin directory.
+<li>To build the demonstration collection that comes with the distribution run the builddemo.sh script
+from within the gsdl directory.
+<li>The gsdl/etc/site.cfg.example file must be saved as gsdl/etc/site.cfg and edited to suit your site.
+Things that may need changing are httpprefix (the web path to the gsdl directory) and httpimg (the path
+to gsdl/images).
+</ul>
+
+<p> The current distribution of the Greenstone software was developed primarily for use on unix systems.
+The software does run under Windows/DOS however and windows specific distributions (including pre-compiled 
+binaries) will soon be made available.
+
+<h4>Bugs</h4>
+Please report bugs or installation problems to <a href="mailto:greenstone@cs.waikato.ac.nz">greenstone@cs.waikato.ac.nz</a>
+
+}
Index: /trunk/gsdl/macros/help.dm
===================================================================
--- /trunk/gsdl/macros/help.dm	(revision 875)
+++ /trunk/gsdl/macros/help.dm	(revision 876)
@@ -2,139 +2,19 @@
 
 _imagethispage_ {_iconthispage_}
-_iconthispage_ {<img src="_httpimg_/h_help.gif" alt="Help" width="200" height="57">}
-_iconthispage_ [l=mi] {<img src="_httpimg_/mh_help.gif" alt="&Auml;whina" width="200" height="57">}
+_iconthispage_ {<img src="_httpimg_/h_help.gif" alt="_textHelp_" width="200" height="57">}
+_iconthispage_ [l=mi] {<img src="_httpimg_/mh_help.gif" alt="_textHelp_" width="200" height="57">}
 
+_httpicondtchdemo_ {_httpimg_/edtchof.gif}
+_httpicondtchdemo_ [l=mi] {_httpimg_/medtchof.gif}
+_httpiconeexpdemo_ {_httpimg_/eexpcof.gif}
+_httpiconeexpdemo_ [l=mi] {_httpimg_/meexpcof.gif}
+_httpiconealltdemo_ {_httpimg_/ealltof.gif}
+_httpiconealltdemo_ [l=mi] {_httpimg_/mealltof.gif}
+
+_textnumbrowseoptions_ {_If_("_numbrowseoptions_" != "1",<p>_texttanumbrowseoptions_)}
 
 _simplehelp_ {
 _textnumbrowseoptions_
 _textbrowseoptions_
-<p><br>_iconexplain_
-}
-
-_textSearchshort_ {search for particular words}
-_textSearchshort_ [l=mi] {rapua he kupu}
-_textSeriesshort_ {access publications by series}
-_textSeriesshort_ [l=mi] {tirohia te whakar&auml;rangi taitara}
-_textDateshort_ {access publications by date}
-_textDateshort_ [l=mi] {tirohia te whakar&auml;rangi e p&auml; ana ki te w&auml;}
-_textSubjectshort_ {access publications by subject}
-_textTitleshort_ {access publications by title}
-_textBrowseshort_ {browse publications}
-_textCreatorshort_ {access publications by author}
-_textOrganizationshort_ {access publications by organization}
-_textHowtoshort_ {access publications by how to listing}
-_textTopicshort_ {access publications by topic}
-_textPeopleshort_ {access publications by people}
-_textdefaultshorttext_ {undefined classification}
-
-_textSearchlong_ {
-<p>You can <i>search for particular words</i> that appear in the text from the
-"search" page. This is the first page that comes up when you begin, and can be
-reached from other pages by pressing the <i>search</i> button.
-}
-
-_textSearchlong_ [l=mi] {
-<p>Ko te wh&auml;rangi rapu te wh&auml;rangi <i>e rapu atu ai ng&auml; kupu</i> i roto
-i ng&auml; tuhinga. Kia puta mai ai t&euml;nei wh&auml;rangi, i a koe e titiro ana ki 
-te kohinga niupepa nei p&auml;whiritia te p&auml;tene <i>rapu</i>.
-}
-
-_textTitlelong_ {
-<p>You can <i>access publications by title</i> by pressing the <i>titles a-z</i>
-button.  This brings up a list of books in alphabetic order.
-}
-
-_textOrganizationlong_ {
-<p>You can <i>access publications by organization</i> by pressing the <i>organization</i>
-button.  This brings up a list of organizations.
-}
-
-_textHowtolong_ {
-<p>You can <i>access publications by how to listing</i> by pressing the <i>how to</i>
-button.  This brings up a list of how to strings.
-}
-
-_textCreatorlong_ {
-<p>You can <i>access publications by author</i> by pressing the <i>authors a-z</i>
-button.  This brings up a list of books, sorted by author name.
-}
-
-_textTopiclong_ {
-<p>You can <i>access publications by topic</i> by pressing the <i>topic</i>
-button.  This brings up a list of topics to browse.
-}
-
-_textSubjectlong_ {
-<p>You can <i>access publications by subject</i> by pressing the <i>subjects</i>
-button.  This brings up a list of subjects, represented by bookshelves.
-}
-
-_textSerieslong_ {
-<p>You can <i>access publications by series</i> by pressing the <i>series</i> button. 
-This brings up a list of those series which are currently in the collection. 
-}
-
-_textSerieslong_ [l=mi] {
-<p>Kia <i>tirohia te whakar&auml;rangi taitara</i> p&auml;whiritia te p&auml;tene 
-<i>whakar&auml;rangi taitara</i>. Ka puta mai te whakar&auml;rangi o ng&auml;
-niupepa e p&auml; ana ki ng&auml; taitara.
-}
-
-_textDatelong_ {
-<p>You can <i>access publications by date</i> by pressing the <i>dates</i> button. 
-This brings up a list of all the issues, sorted chronologically.
-}
-
-_textDatelong_ [l=mi] {<p>Kia <i>tirohia te whakar&auml;rangi e p&auml; ana ki te w&auml;</i> p&auml;whiritia te
-p&auml;tene <i>w&auml;taka</i>. Ka puta mai te whakar&auml;rangi o ng&auml; niupepa
-e p&auml; ana ki te w&auml; i puta mai ai aua niupepa.
-}
-
-_textBrowselong_ {
-<p>You can <i>browse publications</i> by pressing the <i>browse</i> button.
-}
-
-_textPeoplelong_ {
-<p>You can <i>access publications by people</i> by pressing the 
-   <i>people a-z</i> button.  This brings up a list of entries, sorted by 
-     surname.
-}
-
-_textdefaultlongtext_ {
-<p>Click on the <i>unknown</i> button to browse publications (listing is sorted
-by an unknown field).
-}
-
-
-_iconexplain_ {
-<table cellspacing="0" cellpadding="2" border="0">
-<tr valign="top"><td><img src="_httpimg_/book.gif" width="18" height="11" border="0"></td>
-<td>Click on a book icon to read the corresponding book</td></tr></table>
-<table cellspacing="0" cellpadding="2" border="0">
-<tr valign="top"><td><img src="_httpimg_/bshelf.gif" border="0" width=20 height=16></td>
-<td>Click on a bookshelf icon to look at books on that subject</td></tr>
-</table>
-}
-
-_iconexplain_ [l=mi] {
-<table cellspacing="0" cellpadding="2" border="0">
-<tr valign="top"><td><img src="_httpimg_/book.gif" width="18" height="11" border="0"></td>
-<td>Pat&ouml;hia te p&auml;tene pukapuka kia puta mai ai taua pukapuka</td></tr></table>
-<table cellspacing="0" cellpadding="2" border="0">
-<tr valign="top"><td><img src="_httpimg_/bshelf.gif" border="0" width=20 height=16></td>
-<td>Pat&ouml;hia te p&auml;tene kohinga kia puta mai ai ng&auml; niupepa o taua kohinga</td></tr>
-</table>
-}
-
-_iconexplain_ [v=1] {
-<p>
-Click on <b><u>open book</u></b> to read corresponding book.<br>
-Click on <b><u>open section</u></b> to look at books on that subject.
-}
-
-_iconexplain_ [l=mi,v=1] {
-<p>
-Pat&ouml;hia te <b><u>pukapuka</u></b> kia puta mai ai taua pukapuka<br>
-Pat&ouml;hia te <b><u>kohinga</u></b> kia puta mai ai ng&auml; niupepa o taua kohinga
 }
 
@@ -142,467 +22,16 @@
 <center>_navigationbar_</center>
 _texthelptopics_
+<p>_iconblankbar_
 <a name=finding-information>
-_iconblankbar_<br>
 <h2>_textsimplehelpheading_</h2>
 _simplehelp_
-<p>
-<a name=reading-books>
-_iconblankbar_<br>
-_texthelpreadingbooks_
-_textexplainbuttons_
-<p>
+_texthelpreadingdocs_
+<p>_iconblankbar_
 <a name=searching>
-_iconblankbar_<br>
 _texthelpsearching_
-<p>
-_iconblankbar_<br>
-}
-
-################################
-# English text                 #
-################################
-
-_texthelptopics_ {
-<h2 align=left>Topics</h2>
-<ul>
-  <li><a href="\#finding-information">_textsimplehelpheading_</a>
-  <li><a href="\#reading-books">How to read the books</a>
-  <li><a href="\#searching">How to search for particular words</a>
-<ul>
-  <li><a href="\#query-terms">Search terms</a>
-  <li><a href="\#query-type">Query type</a>
-  <li><a href="\#scope-of-queries">Scope of queries</a>
-  <li><a href="\#stemming">Case sensitivity and stemming</a>
-</ul>
-</ul>
-}
-
-_texthelpreadingbooks_ {
-<h2>How to read the books</h2>
-
-<p>You can tell when you have arrived at an individual book because there is a
-photograph of its front cover.  Beside the photograph is a table of contents
-with an arrow marking where you are.  This table is expandable: click on the
-folders to open them or close them.  Click on the open book at the top to close
-it.
-
-<p>Underneath is the text of the current section.  When you have read through
-it, there are arrows at the bottom to take you on to the next section or back
-to the previous one.
-
-<p>Below the photograph are three buttons.  Click on <i>detach</i> to make a
-new browser window for this book.  (This is useful if you want to compare
-books, or read two at once.)  Click on <i>expand contents</i> to expand out the
-whole table of contents so that you can see the titles of all chapters and
-subsections.  Click on <i>expand text</i> to expand out the whole text of the
-current section, or book.  If the book is large, this could take a long time
-and use a lot of memory!
-}
-
-_textnextbutton_ {Click on the arrow to go to the next section ...}
-_textprevbutton_ {... or back to the previous section}
-
-_httpicondtchdemo_ {_httpimg_/edtchof.gif}
-_httpicondtchdemo_ [l=mi] {_httpimg_/medtchof.gif}
-
-_httpiconeexpdemo_ {_httpimg_/eexpcof.gif}
-_httpiconeexpdemo_ [l=mi] {_httpimg_/meexpcof.gif}
-
-_httpiconealltdemo_ {_httpimg_/ealltof.gif}
-_httpiconealltdemo_ [l=mi] {_httpimg_/mealltof.gif}
-
-_textexplainbuttons_ {
-<p>
-<table cellspacing="0" cellpadding="2" border="0">
-<tr><td><img src="_httpimg_/smtext.gif" border="0"></td><td>_document:texticonsmalltext_</td></tr>
-<tr><td><img src="_httpimg_/clsdfldr.gif" border="0"></td><td>_document:texticonclosedfolder_</td></tr>
-<tr><td><img src="_httpimg_/more.gif"></td><td>_textnextbutton_</td></tr>
-<tr><td><img src="_httpimg_/less.gif"></td><td>_textprevbutton_</td></tr>
-<tr><td><img src="_httpicondtchdemo_"></td><td valign="center">_document:texticondetach_</td></tr>
-<tr><td><img src="_httpiconeexpdemo_"></td><td valign="center">_document:texticonexpandtoc_</td></tr>
-<tr><td><img src="_httpiconealltdemo_"></td><td valign="center">_document:texticonexpandtext_</td></tr>
-<tr><td><img src="_document:httpiconehlof_"></td><td valign="center">_document:texticonhighlight_</td></tr>
-</table>
-}
-
-_texthelpsearching_ {
-<h2>How to search for particular words</h2>
-<p>
-  From the search page, you make a query in these simple steps:<p>
-  
-  <ol><li>Specify what documents you want to search
-      <li>Say whether you want to search for all or just some of the words
-      <li>Type in the words you want to search for
-      <li>Click the <i>Begin Search</i> button
-  </ol>
-
-<p>When you make a query, the titles of twenty matching documents will be shown.
-There is a button at the end to take you on to the next twenty documents.  From
-there you will find buttons to take you on to the third twenty or back to the
-first twenty, and so on.  Click the title of any document, or the little button
-beside it, to see it.
-
-<p>A maximum of 100 is imposed on the number of
-  documents returned.  You can change this number by clicking the
-  <i>preferences</i> button at the top of the page.<p>
-
-<p>
-<a name=query-terms>
-_iconblankbar_<br>
-
-<h3>Search terms</h3>
-
-<p>The stuff that you type into the query box is interpreted as a list of words
-called "search terms."  Each term contains nothing but alphabetic characters
-and digits.  Terms are separated by white space.  If any other characters such
-as punctuation appear, they serve to separate terms just as though they were
-spaces.  And then they are ignored.  You can't search for words that include
-punctuation.
-
-<p>For example, the query<p>
-    <ul><kbd>Agro-forestry in the Pacific Islands: Systems for Sustainability (1993)</kbd></ul>
-      <p>will be treated the same as<p>
-      <ul><kbd>Agro forestry in the Pacific Islands  Systems for Sustainability  1993 </kbd></ul><p>
-<p>
-<a name=query-type>
-_iconblankbar_<br>
-
-<h3>Query type</h3>
-
-<p><ul>There are two different kinds of query.<p>
-
-  <li>Queries for <b>all</b> of the words.  These look for chapters (or
-      titles) that 
-      contain all the words you have specified.  Documents that satisfy the
-      query are displayed, in alphabetical order.<p>
-
-  <li>Queries for <b>some</b> of the words.  Just list some terms that are
-      likely to appear in the documents you are looking for.  Documents are
-      displayed in order of how closely they match the query.  When determining
-
-      the degree of match,
-
-      <p><ul>
-        <li> the more search terms a document contains, the closer it matches;
-        <li> rare terms are more important than common ones;
-        <li> short documents match better than long ones.
-      </ul>
-
-      <p>Use as many search terms as you like--a whole sentence, or even a
-      whole paragraph.  If you specify only
-      one term, documents will be ordered by its frequency of occurrence.<p>
-      
-</ul>
-
-<p>
-<a name=other-options><a name=scope-of-queries>
-_iconblankbar_<br>
-_texthelpscope_
-<h3 align=left>Case sensitivity and stemming</h3>
-
-<p>When you click the <i>preferences</i> button at the top of the page you will
-see two pairs of buttons that control the case sensitivity and stemming of your
-queries. The first set of buttons controls whether upper and lower case must
-match (case sensitivity).  The second set controls whether to ignore word
-endings or not (stemming).
-
-<p>For example, if the buttons <i>ignore case differences</i> and
-<i>ignore word endings</i> are selected, the query<p>
-    <ul><kbd>African building</kbd></ul>
-      <p>will be treated the same as<p>
-      <ul><kbd>africa builds</kbd></ul><p>
-      because the uppercase letter in "African" will be transformed to
-      lowercase, and  the suffixes "n" and "ing" will be removed from
-      "African" and "building" respectively (also, "s" would be removed from
-      "builds").
-}
-
-_textnumbrowseoptions_ {<p>There _If_("_numbrowseoptions_" == "1",is 1 way,are _numbrowseoptions_ ways) to 
-find information in this collection:}
-
-_textnumbrowseoptions_ [l=mi] {<p>E _numbrowseoptions_ ng&auml; huarahi hei rapu k&ouml;rero i te kohikohinga niupepa}
-
-_textsimplehelpheading_ {How to find information}
-
-_texthelpscope_ {
-<h3 align=left>Scope of queries</h3>
-
-<p>
-You can choose the "granularity" at which your search is done, that
-is, the size of the text against which the query is matched.
-You can choose <i>title</i> or
-<i>chapter</i>.
-
-<p>Regardless of how you search, the results are always displayed in terms of a
-complete book, opened at the appropriate place.
-
-<p>
-<a name=stemming>
-_iconblankbar_<br>
-}
-
-
-################################
-# Maori text                   #
-################################
-
-
-_texthelptopics_ [l=mi] {
-<h2 align=left>Kaupapa</h2>
-<ul>
-  <li><a href="\#finding-information">Ng&auml; huarahi hei rapu k&ouml;rero</a>
-  <li><a href="\#reading-books">Te p&auml;nui niupepa/kupu whakataki</a>
-  <li><a href="\#searching">Te rapu kupu</a>
-<ul>
-  <li><a href="\#query-terms">Ng&auml; kupu hei rapu</a>
-  <li><a href="\#query-type">Ng&auml; t&uuml;momo rapu</a>
-  <li><a href="\#scope-of-queries">Te wh&auml;nui o te rapu</a>
-  <li><a href="\#stemming">Ng&auml; p&uuml; matua, p&uuml; iti me ng&auml; k&uuml;muri hoki</a>
-</ul>
-</ul>
-}
-
-_texthelpsearching_ [l=mi] {
-<h2>Te rapu kupu</h2>
-<p>
-  Ko te wh&auml;rangi rapu te wh&auml;rangi hei rapu kupu. Ka puta mai taua wh&auml;rangi ka
-  whai mai &euml;nei k&ouml;kiri kia rapu ai i (t)&euml;tehi kupu:<p>	
-
-  <ol><li>K&ouml;whiritia ko ng&auml; niupepa, ko ng&auml; kupu whakataki r&auml;nei, 
-	ko ng&auml; r&auml;popoto reo P&auml;keh&auml;, ko aua mea e toru r&auml;nei
-      <li>K&ouml;whiritia ko &euml;tehi o ng&auml; kupu rapu, ko te katoa r&auml;nei o ng&auml;
-          kupu rapu
-      <li>Tuhia ng&auml; kupu rapu
-      <li>Pat&ouml;hia te p&auml;tene <i>Rapua</i>
-  </ol>
-<p>Ka tukua te rapu ka hoki mai ng&auml; pukapuka rua tekau e p&auml; ana ki &auml;u kupu rapu.
-He p&auml;tene kei raro r&auml; o te wh&auml;rangi hei titiro ai ki ng&auml; pukapuka 21 ki te
-40 e p&auml; ana ki &auml;u kupu rapu. M&auml; &euml;nei p&auml;tene kei raro r&auml; ka taea
-te tirohia te katoa o ng&auml; wh&auml;rangi e p&auml; ana ki t&auml;u i rapu ai.
-
-<p>Ka kore e nuku atu i te 100 o ng&auml; pukapuka ka kitea i t&euml;tehi rapunga. Heoi an&auml;
-ka taea te whakarerek&euml; t&euml;nei nama i te wh&auml;rangi whiriwhiringa.
-
-<p>
-<a name=query-terms>
-_iconblankbar_<br>
-
-<h3>Ng&auml; kupu hei rapu</h3>
-
-<p>Koia nei ng&auml; kupu ka tuhia ki roto i te pouaka rapu. Me tuhi ko ng&auml; reta me ng&auml;
-nama anak&euml;. Kaua e tuhia ng&auml; tohu t&ouml;, he uaua te kite i ng&auml; tohu t&ouml; i roto 
-i ng&auml; niupepa. Me noho te mokow&auml; (w&auml;hi w&auml;tea) i waenganui i ng&auml; kupu.
-Kaua e tuhi ng&auml; tuhutuhi (p&euml;r&auml; i te "?" me te "/"), ka tangohia aua tohu e te
-rorohiko nei, ka whakauru ko te mokow&auml;.
-
-<p>Hei tauira, ki te tuku atu i &euml;nei kupu rapu;
-    <ul><kbd>huihuinga-a-motu / Whanganui (1860-1885)</kbd></ul>
-       <p>ka rapua k&euml;tia e te rorohiko &euml;nei kupu;
-    <ul><kbd>huihuinga a motu Whanganui 1860 1885</kbd></ul><p>
-
-<p>
-<a name=query-type>
-_iconblankbar_<br>
-
-<h3>Ng&auml; T&uuml;momo Rapu</h3>
-
-<p><ul>E rua ng&auml; t&uuml;momo rapu<p>
-
-  <li>Ka rapua te <b>katoa</b> o &auml;u kupu rapu. Ka rapua ng&auml; pukapuka e mau ana i te katoa
-      o ng&auml; kupu rapu kua tuhia e koe. Ka whakaatu mai aua pukapuka e p&auml; ana ki te 
-      whakar&auml;rangi-&auml;-p&uuml;.
-
-  <li>Ka rapua <b>&euml;tehi</b> o &auml;u kupu rapu. N&ouml; reira, me tuhi noa he kupu e p&auml;
-      ana ki te kaupapa e hiahia ana koe. Ka whakar&auml;rangitia ng&auml; pukapuka e p&auml; ana
-      ki te ritenga ki &auml;u kupu rapu. Ar&auml;, ka puta tuatahitia mai ng&auml; pukapuka;	 
-
-      <p><ul>
-        <li> e mau ana i te maha o &auml;u kupu rapu;
-        <li> e mau ana i ng&auml; kupu uaua te kite o &auml;u kupu rapu;
-        <li> e iti ana, ka whai mai ko ng&auml; pukapuka nui.
-      </ul>
-
-      <p>Me tuhi i te maha o ng&auml; kupu rapu kia arahina te rapu ki t&ouml; ake hiahia.
-</ul>
-
-<p>
-<a name=other-options><a name=scope-of-queries>
-_iconblankbar_<br>
-
-_texthelpscope_
-
-<h3 align=left>Ng&auml; p&uuml; matua, p&uuml; iti me ng&auml; k&uuml;muri hoki</h3>
-
-<p>Pat&ouml;hia te p&auml;tene whiriwhiringa kia puta mai ai te wh&auml;rangi e p&auml;
-ana ki ng&auml; p&uuml; matua, p&uuml; iti me ng&auml; k&uuml;muri hoki. Ka h&auml;ngai
-te whiriwhiringa tuatahi ki ng&auml; p&uuml; matua me ng&auml; p&uuml; iti. &Auml;e
-r&auml;nei, me tika te p&uuml; matua me te p&uuml; iti, k&auml;ore r&auml;nei, hei aha
-te &auml;ta titiro ki ng&auml; p&uuml; matua me ng&auml; p&uuml; iti. Ka h&auml;ngai te
-whiriwhiringa tuarua ki ng&auml; k&uuml;muri o te kupu. &Auml;e r&auml;nei, me tino
-&ouml;rite te k&uuml;muri, k&auml;ore r&auml;nei, hei aha te &auml;ta titiro ki ng&auml; 
-k&uuml;muri o ng&auml; kupu. M&ouml; ng&auml; kupu P&auml;keh&auml; anak&euml; te 
-whiriwhiringa k&uuml;muri.
-
-<p>Hei tauira, mehemea ka k&ouml;whiritia te <i>hei aha te p&uuml; matua me te p&uuml;
-iti</i>, &auml;, ka k&ouml;whiritia hoki te <i>hei aha te k&uuml;muri o te kupu</i>
-k&auml;tahi ka tukua &euml;nei kupu hei rapu;
-<p>
-  <ul><kbd>Aotearoa building</kbd></ul>
-    <p>ka &ouml;rite te whakahoki mai o ng&auml; pukapuka ki &euml;nei kupu rapu
-  <ul><kbd>aotearoa builds</kbd></ul>
-<p>ka p&euml;nei i te mea, k&auml;ore te rapu i te &auml;ta titiro mehemea he p&uuml;
-matua, he p&uuml; iti r&auml;nei, &auml, ka tangohia ng&auml; k&uuml;muri (p&euml;r&auml;
-i te "ing", me te "s") i t&euml;nei whiriwhiringa.
-
-}
-
-_textsimplehelpheading_ [l=mi] {Ng&auml; huarahi hei rapu k&ouml;rero}
-
-_textnextbutton_ [l=mi] {Haere whakamua}
-_textprevbutton_ [l=mi] {Haere whakamuri}
-
-
-
-################################
-# Chinese text                 #
-################################
-
-_texthelptopics_ [l=zh] {
-<h2 align=left>ç®åœ</h2>
-<ul>
-  <li><a href="\#finding-information">_textsimplehelpheading_</a>
-  <li><a href="\#reading-books"> åŠäœé
-è¯»ä¹Šç®</a>
-  <li><a href="\#searching"> åŠäœæç¹å®å­æ¥è¯¢</a>
-<ul>
-  <li><a href="\#query-terms">    æ£çŽ¢é¡¹</a>
-  <li><a href="\#query-type">      æ¥è¯¢ç±»å</a>
-  <li><a href="\#scope-of-queries">      æ¥è¯¢èåŽ</a>
-</ul>
-</ul>
-}
-
-_textsimplehelpheading_ [l=zh] {åŠäœæ¥æŸä¿¡æ¯}
-
-
-_texthelpreadingbooks_ [l=zh] {
-<h2>åŠäœé
-è¯»ä¹Šç®</h2>
-
-<p>   åœè¿å
-¥æäžä¹Šç®æ¶ïŒéè¿å°é¢ïŒäœ å¯åŸç¥å±å¹æ­£åšæŸç€ºåªäžäžªä¹Šç®ïŒå°é¢æèŸ¹æ¯ç®åœè¡šïŒç®­å€Žæææ­€æ¶æå€äœçœ®ãè¯¥ç®åœè¡šæ¯å¯æ©å±çïŒåå»æ­€ç®åœè¡šïŒå¯å®ç°æåŒæå
-³é­ïŒåå»é¡¶éšæåŒçä¹Šç®ä»¥å
-³é­å®ã
-
-<p>ç®åœè¡šäžé¢æ¯åœåéšä»œçææ¬ïŒåšæ­€ä¹åæäž€äžªç®­å€Žåå«æåäžäžéšä»œæåäžéšä»œææ¬ã
-
-<p>åšå°é¢äžæ¹æäžäžªæé®ïŒåå»âåçŠ»âïŒåæåŒåŠäžæµè§çªæŸç€ºè¯¥å±å¹ïŒè¿äžªåèœåšæ³èŠæ¯èŸäžåçä¹Šæåæ¶é
-è¯»äž€æ¬ä¹Šæ¶æ¯æåž®å©çïŒïŒåå»âæ©å±å
-å®¹âä»¥åŸå°æŽäžªä¹Šç®è¡šïŒä»èçå°ææç« èçç®åœïŒåå»âæ©å±ææ¬âå¯è·åŸåœåç« èæä¹Šç®çå
-šéšææ¬ïŒåŠææ¯äžæ¬åŸé¿çä¹ŠïŒå¯èœäŒéèŠèŸé¿çæ¶éŽä»¥åå€§éçå
-å­ã
-}
-
-_textnextbutton_ [l=zh] {ãåå»ç®­å€ŽïŒè¿å
-¥äžäžéšä»œ}
-_textprevbutton_ [l=zh] {ãæè
-è¿ååé¡µ}
-
-_texthelpsearching_ [l=zh] {
-<h2>åŠäœæç¹å®å­æ¥è¯¢</h2>
-<p>
-ä»æ¥è¯¢é¡µïŒæä»¥äžç®åçæ­¥éª€èŸå
-¥æ¥è¯¢é¡¹ïŒ<p>
-  
-  <ol><li>æææ³èŠæ¥è¯¢çæä»¶
-      <li>éæ©æ¯æ¥è¯¢ææå­è¿æ¯éšä»œå­
-      <li>èŸå
-¥èŠæ¥è¯¢çå­
-      <li>åå»âåŒå§æ¥è¯¢â
-  </ol>
-
-<p>è¿è¡æ¥è¯¢åïŒç¬¬äžç»ïŒïŒäžªå¹é
-äžçè®°åœçé¢åäŒæŸç€ºåºæ¥ïŒåšæ­€ïŒïŒäžªé¢åä¹åæäžæé®å¯ä»¥æåäžäžç»ïŒïŒäžªè®°åœçé¢åïŒä»è¯¥å±å¹äœ å¯çå°äž€äžªæé®ïŒäžäžªæé®è¿äžæ­¥æåç¬¬äžç»ïŒïŒäžªè®°åœçé¢åïŒåŠå€äžäžªæé®çšæ¥è¿åäžäžç»é¢åãåå»ä»»äžä¹Šç®çé¢åæå
-¶æèŸ¹çå°æé®ïŒå°±å¯è¿è¡é
-è¯»è¿æ¡è®°åœçè¯Šç»å
-å®¹ã
-
-<p>æå€è¿åïŒïŒïŒæ¡è®°åœïŒåŠèŠæ¹åè¯¥æ°ç®ïŒååå»é¡µé¢å³äžæ¹çâéé¡¹â
-
-<p>
-<a name=query-terms>
-_iconblankbar_<br>
-
-<h2>æ£çŽ¢é¡¹</h2>
-
-<p>èŸå
-¥å°æ¥è¯¢æ¡äž­çå
-å®¹ïŒå°è¢«èœ¬åæäžäžªå«åæ¥è¯¢é¡¹çåå­éïŒæ¥è¯¢é¡¹å¯ä»¥æ¯æ±å­ãé¿æäŒ¯å­æ¯ææ°å­ïŒæ¥è¯¢é¡¹ä¹éŽå¯ä»¥æç©ºæ ŒïŒä¹å¯ä»¥æ²¡æãåŠæéå°å
-¶ä»çç¬Šå·ïŒäŸåŠæ ç¹ç¬Šå·ïŒåäŒè¢«å¿œç¥ïŒå¹¶å°å®ä»¬çäœç©ºæ Œå€çïŒå æ­€äžèœæ¥è¯¢å
-å«æ ç¹ç¬Šå·çè¯ã
-
-<p>äŸåŠïŒæ¥è¯¢<p>
-    <ul><kbd>    å
-å®¹å
-æ¬ïŒèœ¯ä»¶å·¥çšïŒ1999ïŒ</kbd></ul>
-      <p>äžäžé¢çæ¥è¯¢é¡¹å€çæ¯çžåç<p>
-      <ul><kbd>ããå
-å®¹å
-æ¬èœ¯ä»¶å·¥çš1999</kbd></ul><p>
-
-<a name=query-type>
-_iconblankbar_<br>
-
-<h2>æ¥è¯¢ç±»å</h2>
-
-<p><ul>å¯ä»¥æäž€ç§äžåçæ¹åŒæ¥è¯¢ïŒ<p>
-
-  <li>æ¥è¯¢ææçå­ãåšè¿ç§æ
-åµäžç³»ç»å°æ¥æŸå
-æ¬ææåšæ¥è¯¢é¡¹æå®çå­çè®°åœïŒæé¢åïŒãç¬Šåæ¡ä»¶çè®°åœå°è¢«æŸç€ºåšå±å¹äžã
-
-  <li>æ¥è¯¢éšä»œå­ãç³»ç»ä»
-æ¥æŸå
-å«æ¥è¯¢é¡¹äž­ä»»æäžäžªæå äžªå­çè®°åœïŒæä»¶æå
-¶äžæ¥è¯¢å
-å®¹æå¹é
-ççšåºŠæ¥æŸç€ºïŒåšå³å®å¹é
-çšåºŠæ¶ïŒ
-
-      <p><ul>
-        <li> ãå
-å«è¶å€çæ¥è¯¢é¡¹çè®°åœïŒå
-¶å¹é
-çšåºŠè¶é«ïŒ
-        <li> ãå°è§çæ¥è¯¢é¡¹æ¯åžžè§çæ¥è¯¢é¡¹æŽéèŠïŒ
-        <li> ãç­è®°åœæ¯é¿è®°åœçå¹é
-çšåºŠé«ã
-      </ul>
-
-      <p>åšå¯èœçæ
-åµäžïŒäœ¿çšå°œå¯èœå€çæ¥è¯¢é¡¹äžºå¥œïŒäžäžªå¥å­ïŒæè
-äžäžªæ®µèœãåŠæåªç»äžäžªæ¥è¯¢é¡¹ïŒæ¥è¯¢ç»æå°æç
-§å
-¶åšè®°åœäž­åºç°çé¢çè¿è¡æåºã
-      
-</ul>
-
-<p>
-<a name=other-options><a name=scope-of-queries>
-_iconblankbar_<br>
-_texthelpscope_
-}
-
-_texthelpscope_ [l=zh] {
-<h2 align=left>æ¥è¯¢èåŽ</h2>
-
-<p>
-å¯ä»¥éæ©åšä»ä¹èåŽå
-è¿è¡æ¥è¯¢ïŒæ¢æ¥è¯¢é¡¹åšä»ä¹èåŽå
-è¿è¡å¹é
-ãå¯ä»¥éæ©é¢åæç« èã
-
-<p>æ è®ºåšä»ä¹èåŽå
-è¿è¡æ¥è¯¢ïŒæ¥è¯¢ç»æéœå°æ¯æŽæ¡è®°åœã
+<p>_iconblankbar_
+<a name=preferences>
+_texthelppreferences_
+<p>_iconblankbar_
 }
 
@@ -611,2 +40,6 @@
 
 
+
+
+
+
Index: /trunk/gsdl/macros/home.dm
===================================================================
--- /trunk/gsdl/macros/home.dm	(revision 875)
+++ /trunk/gsdl/macros/home.dm	(revision 876)
@@ -22,7 +22,4 @@
 
 _iconnzdl_ {
-<p><img src="_httpimg_/new.gif">Welcome to our new look (still experimental). The old system is
-still up at <a href="http://www.nzdl.org/old">http://www.nzdl.org/old</a>
-<p><br>
 <img src="_httpiconnzdl_" width=_widthnzdl_ height=_heightnzdl_>}
 _icongbull_ {<img src="_httpicongbull_">}
@@ -58,5 +55,5 @@
 #######################################################################
 
-_pagetitle_ {Greenstone Digital Library}
+_pagetitle_ {_textpagetitle_}
 _imagethispage_ {}
 _imagecollection_ {<center>_iconnzdl_</center>}
@@ -94,4 +91,5 @@
 </td></tr></table>
 </td></tr></table>
+_textotherinfo_
 _iconblankbar_
 <table><tr valign=top>
@@ -109,106 +107,10 @@
 #######################################################################
 
-_documents_ { documents. }
-_lastupdate_ {Last updated}
-_ago_ {days ago.}
-_colnotbuilt_ {Collection not built.}
+# moved to english.dm
 
-_textpeople_ {People}
-_textfb_ {Feedback}
-_textpub_ {Publications}
-_texttec_ {Technology}
-_textrw_ {Related Work}
-_textinfosheet_ {Info Sheet}
-_textscreenshots_ {Screen Shots}
-_textnpepainfosheet_ {Niupepa Info Sheet}
 
-_textprojhead_ {The New Zealand Digital Library Project}
 
-_textprojinfo_ {
-<h4>The NZDL system</h4>
 
-<p> The New Zealand Digital Library system comprises several demonstration
-collections -- computer science technical reports and bibliographies, literary
-works, humanitarian and development information, magazines -- and makes them
-available over the Web through full-text interfaces.  Behind the query
-interface lies a huge collection providing gigabytes of information.  We hope
-you find what you want, or at least something intriguing!
 
-<h4>The Greenstone software</h4>
 
-<p> The Greenstone Digital Library software provides a new way of organizing
-information and making it available over the Internet.  A <i>collection</i> of
-information comprises several (typically several thousand, or even several
-million) <i>documents</i>, which share a uniform searching and browsing
-interface.  The collections in a library are organized in a different
-way--though they share a strong family resemblance.  Although primarily
-designed for access over the Web, Greenstone collections can be made available,
-in precisely the same form, on CD-ROM for standalone PCs.  Greenstone is
-open-source software, available under the terms of the Gnu public linense.
- 
-<h4>The research</h4>
 
-<p> The goal of our research program is to explore the potential of
-internet-based digital libraries.  Our vision is to develop systems that
-automatically impose structure on anarchic, uncatalogued, distributed
-repositories of information, thereby providing information consumers with
-effective tools to locate what they need and to peruse it conveniently and
-comfortably.  Our research objectives are to
-
-<ul>
-  <li> develop technology for creating and automatically
-      maintaining collections;
-  <li> monitor usage to study library users' needs;
-  <li> look at novel interfaces that cater to a wide spectrum of users;
-  <li> find ways to abstract layout and bibliographic information
-      from document files;
-  <li> use this information to enhance presentation and for
-      bibliometric research;
-  <li> assess potential subject areas for public-domain collections;
-  <li> survey and critique other digital library projects.
-</ul>
-
-<h4>DigiLib Systems Limited</h4>
-
-<p><a href="http://www.digilibs.com/">DigiLib Systems Limited</a> is an
-innovative software company that creates international digital libraries.
-As a major contributor to the Greenstone Digital Library Software they are
-able to build, customize, and extend digital libraries to meet exacting needs.
-Please <a href="mailto:contact@digilibs.com">contact</a> them for an obligation
-free quote.
-
-}
-
-_textpoem_ {
-<br><h2 align=left>Kia papapounamu te moana</h2>
-
-        <p>kia hora te marino,
-        <br>kia tere te karohirohi,
-        <br>kia papapounamu te moana
-
-        <p>may peace and calmness surround you,
-        <br>may you reside in the warmth of a summer's haze,
-        <br>may the ocean of your travels be as smooth as the polished greenstone.
-}
-
-_textgreenstone_ {
-<p><br>
-Greenstone is a semi-precious stone that (like this software) is sourced in
-New Zealand.  In traditional Maori society it was the most highly prized and
-sought after of all substances.  It can absorb and hold <i>wairua</i>, which is
-a spirit or life force, and is endowed with traditional virtues that make it an
-appropriate emblem for a public-domain digital library project.  Its lustre
-shows charity; its translucence, honesty; its toughness, courage; and the sharp
-edge it can take, justice.  The carved piece used in the Greenstone Digital
-Library Software logo is a <i>patu</i> or fighting club, and is a family
-heirloom of one of our project members.  In hand-to-hand combat its delivery is
-very quick, very accurate, and very complete.  We like to think these qualities
-also apply to our software, the razor sharp edge of the <i>patu</i> symbolizing
-the leading edge of technology.
-
-<p><a href="mailto:greenstone@cs.waikato.ac.nz">Greenstone Digital Library Software</a>
-<br><a href="http://www.cs.waikato.ac.nz/cs">Computer Science Department</a>, 
-<a href="http://www.waikato.ac.nz">University of Waikato</a>, New Zealand
-
-<br>October 1999
-}
Index: /trunk/gsdl/macros/html.dm
===================================================================
--- /trunk/gsdl/macros/html.dm	(revision 875)
+++ /trunk/gsdl/macros/html.dm	(revision 876)
@@ -11,9 +11,9 @@
 
 _content_ {
-<frameset rows="50,*" noresize border=0>
+<frameset rows="68,*" noresize border=0>
   <frame frameborder=0 src="_gwcgi_?e=_compressedoptions_&a=p&p=nav">
   <frame frameborder=0 src="_cgiarghp_">
   <noframes>
-  <p>You must have a frame enabled browser to view this.</p>
+  <p>_textframebrowser_</p>
   </noframes>
 </frameset>
@@ -23,10 +23,26 @@
 package nav
 
-_header_ {<html>
+_header_ {_cgihead_
+_htmlhead_
+<center>
+<table width=_pagewidth_><tr><td align=right>
+_javalinks_</td></tr></table>
+</center>
+}
+
+_faoheader_ [v=1] {_cgihead_
+_htmlhead_
+_javalinks_
+}
+
+_htmlhead_ {
+<html>
 <head>
+<title>_pagetitle_</title>
 <base target="_top">
 _globalscripts_
 </head>
-<body bgcolor="\#ffffff" text="\#000000" link="\#006666"
+
+<body bgcolor="\#ffffff" text="\#000000" link="\#006666" 
       alink="\#cc9900" vlink="\#666633">
 }
@@ -38,7 +54,13 @@
 _content_ {
 <center>
-<br>
 _navigationbar_
 </center>
 }
 
+
+
+
+
+
+
+
Index: /trunk/gsdl/macros/maori.dm
===================================================================
--- /trunk/gsdl/macros/maori.dm	(revision 876)
+++ /trunk/gsdl/macros/maori.dm	(revision 876)
@@ -0,0 +1,257 @@
+
+package about
+
+_textabcol_ [l=mi] {He kupu whakam&auml;rama i te kohikohinga niupepa}
+
+########################################################################
+package Global
+
+_textimagehelp_ [l=mi] {Te wh&auml;rangi whakam&auml;rama}
+_textimagepref_ [l=mi] {Te wh&auml;rangi o ng&auml; whiriwhiringa}
+_textimagehome_ [l=mi] {Te wh&auml;rangi k&auml;inga}
+_textimagesearch_ [l=mi] {rapua he kupu}
+_textimagebrowseseries_ [l=mi] {Tirohia te whakar&auml;rangi o ng&auml; niupepa}
+_textimagebrowsedates_ [l=mi] {Tirohia te w&auml; i puta mai ai ng&auml; niupepa}
+
+_page_ [l=mi] {wh&auml;rangi }
+_vol_ [l=mi] {Pukapuka}
+_num_ [l=mi] {Nama}
+_textmonth01_ [l=mi] {Hanuere}
+_textmonth02_ [l=mi] {Pepuere}
+_textmonth03_ [l=mi] {Maehe}
+_textmonth04_ [l=mi] {Aperira}
+_textmonth05_ [l=mi] {Mei}
+_textmonth06_ [l=mi] {Hune}
+_textmonth07_ [l=mi] {Hurae}
+_textmonth08_ [l=mi] {Akuhata}
+_textmonth09_ [l=mi] {Hepetema}
+_textmonth10_ [l=mi] {Oketopa}
+_textmonth11_ [l=mi] {Noema}
+_textmonth12_ [l=mi] {Tihema}
+_of_ [l=mi] { i te }
+
+
+_texticontabsearchgreen_ [l=mi] {rapu}
+_texticontabdatesgreen_ [l=mi] {w&auml;taka}
+_texticontabseriesgreen_ [l=mi] {whakar&auml;rangi niupepa}
+_texticonnext_ [l=mi] {titiro ki te wh&auml;rangi o muri}
+_texticonprev_ [l=mi] {titiro ki te wh&auml;rangi o mua}
+_texticontext_ [l=mi] {Tirohia te wh&auml;rangi}
+
+_textimageSeries_ [l=mi] {Tirohia te whakar&auml;rangi taitara}
+_textimageDate_ [l=mi] {Tirohia te whakar&auml;rangi w&auml;taka}
+
+###################################################################
+
+package document
+
+_texticondetach_ [l=mi] {Huakina mai he matapihi hou m&ouml; t&euml;nei k&ouml;rero}
+_texticonexpandtext_ [l=mi] {Titiro ki ng&auml; kupu katoa o t&euml;nei niupepa}
+_texticoncontracttext_ [l=mi] {Titiro ki ng&auml; kupu o t&euml;nei wh&auml;rangi anake}
+_texticonopenbookshelf_ [l=mi] {k&auml;tia}
+_texticonclosedbookshelf_ [l=mi] {whakat&uuml;whera mai}
+_texticonclosedbook_ [l=mi] {whakat&uuml;whera mai}
+_texticonopenbook_ [l=mi] {k&auml;tia}
+_texticonpointer_ [l=mi] {w&auml;hanga e tiro ana}
+_texticonhighlight_ [l=mi] {Kia p&uuml;kaha ng&auml; kupu rapu}
+_texticonnohighlight_ [l=mi] {Kia kore he p&uuml;kaha}
+_texticonsmalltext_ [l=mi] {He wh&auml;rangi niupepa}
+_texticonclosedfolder_ [l=mi] {He k&ouml;paki}
+
+####################################################################
+
+package help
+
+_texttanumbrowseoptions_ [l=mi] {E _numbrowseoptions_ ng&auml; huarahi hei rapu k&ouml;rero i te kohikohinga niupepa}
+
+_textHelp_ [l=mi] {&Auml;whina}
+_textSearchshort_ [l=mi] {rapua he kupu}
+
+_textSeriesshort_ [l=mi] {tirohia te whakar&auml;rangi taitara}
+
+_textDateshort_ [l=mi] {tirohia te whakar&auml;rangi e p&auml; ana ki te w&auml;}
+
+
+_textSearchlong_ [l=mi] {
+<p>Ko te wh&auml;rangi rapu te wh&auml;rangi <i>e rapu atu ai ng&auml; kupu</i> i roto
+i ng&auml; tuhinga. Kia puta mai ai t&euml;nei wh&auml;rangi, i a koe e titiro ana ki 
+te kohinga niupepa nei p&auml;whiritia te p&auml;tene <i>rapu</i>.
+}
+
+
+_textSerieslong_ [l=mi] {
+<p>Kia <i>tirohia te whakar&auml;rangi taitara</i> p&auml;whiritia te p&auml;tene 
+<i>whakar&auml;rangi taitara</i>. Ka puta mai te whakar&auml;rangi o ng&auml;
+niupepa e p&auml; ana ki ng&auml; taitara.
+}
+
+_textDatelong_ [l=mi] {<p>Kia <i>tirohia te whakar&auml;rangi e p&auml; ana ki te w&auml;</i> p&auml;whiritia te
+p&auml;tene <i>w&auml;taka</i>. Ka puta mai te whakar&auml;rangi o ng&auml; niupepa
+e p&auml; ana ki te w&auml; i puta mai ai aua niupepa.
+}
+
+_texthelptopics_ [l=mi] {
+<h2 align=left>Kaupapa</h2>
+<ul>
+  <li><a href="\#finding-information">Ng&auml; huarahi hei rapu k&ouml;rero</a>
+  <li><a href="\#reading-books">Te p&auml;nui niupepa/kupu whakataki</a>
+  <li><a href="\#searching">Te rapu kupu</a>
+<ul>
+  <li><a href="\#query-terms">Ng&auml; kupu hei rapu</a>
+  <li><a href="\#query-type">Ng&auml; t&uuml;momo rapu</a>
+  <li><a href="\#scope-of-queries">Te wh&auml;nui o te rapu</a>
+  <li><a href="\#stemming">Ng&auml; p&uuml; matua, p&uuml; iti me ng&auml; k&uuml;muri hoki</a>
+</ul>
+</ul>
+}
+
+_texthelpsearching_ [l=mi] {
+<h2>Te rapu kupu</h2>
+<p>
+  Ko te wh&auml;rangi rapu te wh&auml;rangi hei rapu kupu. Ka puta mai taua wh&auml;rangi ka
+  whai mai &euml;nei k&ouml;kiri kia rapu ai i (t)&euml;tehi kupu:<p>	
+
+  <ol><li>K&ouml;whiritia ko ng&auml; niupepa, ko ng&auml; kupu whakataki r&auml;nei, 
+	ko ng&auml; r&auml;popoto reo P&auml;keh&auml;, ko aua mea e toru r&auml;nei
+      <li>K&ouml;whiritia ko &euml;tehi o ng&auml; kupu rapu, ko te katoa r&auml;nei o ng&auml;
+          kupu rapu
+      <li>Tuhia ng&auml; kupu rapu
+      <li>Pat&ouml;hia te p&auml;tene <i>Rapua</i>
+  </ol>
+<p>Ka tukua te rapu ka hoki mai ng&auml; pukapuka rua tekau e p&auml; ana ki &auml;u kupu rapu.
+He p&auml;tene kei raro r&auml; o te wh&auml;rangi hei titiro ai ki ng&auml; pukapuka 21 ki te
+40 e p&auml; ana ki &auml;u kupu rapu. M&auml; &euml;nei p&auml;tene kei raro r&auml; ka taea
+te tirohia te katoa o ng&auml; wh&auml;rangi e p&auml; ana ki t&auml;u i rapu ai.
+
+<p>Ka kore e nuku atu i te 100 o ng&auml; pukapuka ka kitea i t&euml;tehi rapunga. Heoi an&auml;
+ka taea te whakarerek&euml; t&euml;nei nama i te wh&auml;rangi whiriwhiringa.
+
+<p>
+<a name=query-terms>
+_iconblankbar_<br>
+
+<h3>Ng&auml; kupu hei rapu</h3>
+
+<p>Koia nei ng&auml; kupu ka tuhia ki roto i te pouaka rapu. Me tuhi ko ng&auml; reta me ng&auml;
+nama anak&euml;. Kaua e tuhia ng&auml; tohu t&ouml;, he uaua te kite i ng&auml; tohu t&ouml; i roto 
+i ng&auml; niupepa. Me noho te mokow&auml; (w&auml;hi w&auml;tea) i waenganui i ng&auml; kupu.
+Kaua e tuhi ng&auml; tuhutuhi (p&euml;r&auml; i te "?" me te "/"), ka tangohia aua tohu e te
+rorohiko nei, ka whakauru ko te mokow&auml;.
+
+<p>Hei tauira, ki te tuku atu i &euml;nei kupu rapu;
+    <ul><kbd>huihuinga-a-motu / Whanganui (1860-1885)</kbd></ul>
+       <p>ka rapua k&euml;tia e te rorohiko &euml;nei kupu;
+    <ul><kbd>huihuinga a motu Whanganui 1860 1885</kbd></ul><p>
+
+<p>
+<a name=query-type>
+_iconblankbar_<br>
+
+<h3>Ng&auml; T&uuml;momo Rapu</h3>
+
+<p><ul>E rua ng&auml; t&uuml;momo rapu<p>
+
+  <li>Ka rapua te <b>katoa</b> o &auml;u kupu rapu. Ka rapua ng&auml; pukapuka e mau ana i te katoa
+      o ng&auml; kupu rapu kua tuhia e koe. Ka whakaatu mai aua pukapuka e p&auml; ana ki te 
+      whakar&auml;rangi-&auml;-p&uuml;.
+
+  <li>Ka rapua <b>&euml;tehi</b> o &auml;u kupu rapu. N&ouml; reira, me tuhi noa he kupu e p&auml;
+      ana ki te kaupapa e hiahia ana koe. Ka whakar&auml;rangitia ng&auml; pukapuka e p&auml; ana
+      ki te ritenga ki &auml;u kupu rapu. Ar&auml;, ka puta tuatahitia mai ng&auml; pukapuka;	 
+
+      <p><ul>
+        <li> e mau ana i te maha o &auml;u kupu rapu;
+        <li> e mau ana i ng&auml; kupu uaua te kite o &auml;u kupu rapu;
+        <li> e iti ana, ka whai mai ko ng&auml; pukapuka nui.
+      </ul>
+
+      <p>Me tuhi i te maha o ng&auml; kupu rapu kia arahina te rapu ki t&ouml; ake hiahia.
+</ul>
+
+<p>
+<a name=other-options><a name=scope-of-queries>
+_iconblankbar_<br>
+
+_texthelpscope_
+
+<h3 align=left>Ng&auml; p&uuml; matua, p&uuml; iti me ng&auml; k&uuml;muri hoki</h3>
+
+<p>Pat&ouml;hia te p&auml;tene whiriwhiringa kia puta mai ai te wh&auml;rangi e p&auml;
+ana ki ng&auml; p&uuml; matua, p&uuml; iti me ng&auml; k&uuml;muri hoki. Ka h&auml;ngai
+te whiriwhiringa tuatahi ki ng&auml; p&uuml; matua me ng&auml; p&uuml; iti. &Auml;e
+r&auml;nei, me tika te p&uuml; matua me te p&uuml; iti, k&auml;ore r&auml;nei, hei aha
+te &auml;ta titiro ki ng&auml; p&uuml; matua me ng&auml; p&uuml; iti. Ka h&auml;ngai te
+whiriwhiringa tuarua ki ng&auml; k&uuml;muri o te kupu. &Auml;e r&auml;nei, me tino
+&ouml;rite te k&uuml;muri, k&auml;ore r&auml;nei, hei aha te &auml;ta titiro ki ng&auml; 
+k&uuml;muri o ng&auml; kupu. M&ouml; ng&auml; kupu P&auml;keh&auml; anak&euml; te 
+whiriwhiringa k&uuml;muri.
+
+<p>Hei tauira, mehemea ka k&ouml;whiritia te <i>hei aha te p&uuml; matua me te p&uuml;
+iti</i>, &auml;, ka k&ouml;whiritia hoki te <i>hei aha te k&uuml;muri o te kupu</i>
+k&auml;tahi ka tukua &euml;nei kupu hei rapu;
+<p>
+  <ul><kbd>Aotearoa building</kbd></ul>
+    <p>ka &ouml;rite te whakahoki mai o ng&auml; pukapuka ki &euml;nei kupu rapu
+  <ul><kbd>aotearoa builds</kbd></ul>
+<p>ka p&euml;nei i te mea, k&auml;ore te rapu i te &auml;ta titiro mehemea he p&uuml;
+matua, he p&uuml; iti r&auml;nei, &auml, ka tangohia ng&auml; k&uuml;muri (p&euml;r&auml;
+i te "ing", me te "s") i t&euml;nei whiriwhiringa.
+
+}
+
+_textsimplehelpheading_ [l=mi] {Ng&auml; huarahi hei rapu k&ouml;rero}
+
+_textnextbutton_ [l=mi] {Haere whakamua}
+_textprevbutton_ [l=mi] {Haere whakamuri}
+
+
+#######################################################################
+
+package query
+
+
+_texticonthispage_ [l=mi] {rapu}
+_textsome_ [l=mi] {&euml;tehi}
+_textall_ [l=mi] {_If_(_cgiargb_,te boolean,katoa)}
+_textbeginsearch_ [l=mi] {Rapua}
+_textfreqmsg1_ [l=mi] {Kia hia ng&auml; kupu: }
+_textmorethan_ [l=mi] {Neke atu i te }
+_textnodocs_ [l=mi] {k&auml;ore he pukapuka e p&auml; ana ki &auml;u kupu rapu.}
+_text1doc_ [l=mi] {1 te pukapuka e p&auml; ana ki &auml;u kupu rapu.}
+_textlotsdocs_ [l=mi] {ng&auml; pukapuka e p&auml; ana ki &auml;u kupu rapu.}
+_textmatches_ [l=mi] {Kitenga }
+_textstemon_ [l=mi] { (hei aha te k&uuml;muri)}
+
+_textsimplesearch_ [l=mi] {Tirohia ki _If_(_hselection_, _hselection_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) m&ouml; _querytypeselection_ o ng&auml; kupu}
+
+_textadvancedsearch_ [l=mi] {Tirohia ki_If_(_hselection_, _hselection_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) 
+m&ouml; _querytypeselection_ o ng&auml; kupu}
+
+################################################################################
+
+package preferences
+
+_textpreferences_ [l=mi] {Whiriwhiringa}
+_textignorecase_ [l=mi] { hei aha te p&uuml; matua me te p&uuml; iti}
+_textmatchcase_ [l=mi] { me tika te p&uuml; matua me te p&uuml; iti}
+_textstem_ [l=mi] { hei aha te k&uuml;muri}
+_textnostem_ [l=mi] { me tika te k&uuml;muri}
+_textprefop_ [l=mi] {Whakahokia mai te _maxdocoption_ kupu, &auml;, kia _hitsperpageoption_ kupu ki ia wh&auml;rangi.}
+_textlanguage_ [l=mi] {Reo: }
+_textencoding_ [l=mi] {Whakatakotoranga p&uuml;: }
+_textformat_ [l=mi] {Whakatakotoranga wh&auml;rangi: }
+_textsimplemode_ [l=mi] {te rapu wh&auml;iti}
+_textadvancedmode_ [l=mi] {te rapu wh&auml;nui (ka taea te whakamahia ng&auml; p&uuml; boolean, 
+p&euml;r&auml; i te !, &, |, me te "()" hoki)}
+_textgraphical_ [l=mi] {Whakaahua}
+_texttextual_ [l=mi] {K&auml;ore he whakaahua}
+
+
+
+
+
+
+
+
+
+
Index: /trunk/gsdl/macros/mg.dm
===================================================================
--- /trunk/gsdl/macros/mg.dm	(revision 876)
+++ /trunk/gsdl/macros/mg.dm	(revision 876)
@@ -0,0 +1,130 @@
+package mg
+
+#######################################################################
+# java images/scripts
+#######################################################################
+
+# the _javalinks_ macros are the flashy image links at the top right of
+# the page. 
+
+_javalinks_ {_imagehome_}
+_javalinks_ [v=1] {
+_imagehome_<br>
+}
+
+
+#######################################################################
+# icons
+#######################################################################
+
+_iconhmg_ {<img src="_httpiconhmg_" width=_widthhmg_ height=_heighthmg_}
+
+#######################################################################
+# http macros 
+#
+# These contain the url without any quotes
+#######################################################################
+
+_httpiconhmg_ {_httpimg_/h\_mg.gif}
+_widthhmg_ {200}
+_heighthmg_ {57}
+
+
+#######################################################################
+# page content
+#######################################################################
+
+_pagetitle_ {NZDL: MG}
+
+_imagethispage_ {_iconhmg_}
+
+_content_ {
+_iconblankbar_
+
+<p><i>MG</i> is a freely-available full-text retrieval system that
+makes efficient use of disk resources by storing the index, and the
+text that is indexed, in compressed form. The <i>MG</i> system is 
+described in the eponymous book 
+<a href="http://www.cs.mu.oz.au/mg/"><i>Managing
+Gigabytes</i></a>. To meet
+the needs of The New Zealand Digital Library we have made a number
+of improvements to the standard <i>MG</i> distribution. These
+improvements are being made available as <i>MG-1.3</i>.
+
+<p><i>MG-1.3</i> offers:
+
+<dl>
+
+<dt><b>Flexible stemming methods</b>
+<dd>Different stemming methods can be used in the same collection. In the
+original version a collection could only use a single stemming method, now
+all four combinations of stemming and casefolding can be used in queries.
+This can be applied to whole queries as well as individual words.
+
+<dt><b>Weighting terms</b>
+<dd>Weightings can be applied to individual terms in a ranked query. This
+allows a user to influence the order that documents are returned with
+documents with the higher rated words nearer the top.
+
+<dt><b>Term frequencies</b>
+<dd>The number of times each query term appears in the collection can be
+displayed during a query. 
+
+<dt><b>Decompression of text</b>
+<dd>A small program is included in the distribution which allows you to
+decompress all the text with the document and paragraph breaks inserted
+at all the right places. With minimal programming you could then rebuild
+the collection from the compressed text.
+
+<dt><b>Merging of level 3 indexes</b>
+<dd>In the original version merging indexes was only implemented for
+level 2 indexes. We have extended this to also include level 3 indexes.
+
+<dt><b>Machine independant indexes</b>
+<dd>The indexes are now always written using network byte ordering, which
+is big endian. This means that indexes built on little endian machines can
+be used on big endian machines providing the two machines have data types
+the same length and use the same floating point formats.
+
+<dt><b>Port to MSDOS</b>
+<dd>A port of <i>MG</i> to MSDOS with 32 bit processing has also been
+incorporated into the distribution. This port allows <i>MG</i> to be
+compiled on Windows95 and WindowsNT.
+
+</dl>
+<br>
+
+<h3>Installing MG-1.3</h3>
+
+Installing <i>MG-1.3</i> on unix systems is the same as the standard 
+distribution.
+
+<ul>
+
+<li>Download the <a href="http://www.nzdl.org/technology/mg-1.3f.tar.gz"><i>MG-1.3f</i></a>
+distribution.
+<li>Change your current working directory to where the distribution was unpacked and
+type &quot;<tt>./configure --prefix=`pwd`;</tt>&quot;. When the configure script has finished
+running type &quot;<tt>make</tt>&quot; and then &quot;<tt>make install</tt>&quot;.
+<li>Test the installation by typing &quot;<tt>make check</tt>&quot;.
+
+</ul>
+
+If you have trouble during installation procedure see the INSTALL instructions
+included with the distribution.
+
+<p>Installing <i>MG-1.3f</i> on 32-bit MSDOS operating systems currently consists of
+typing &quot;nmake win32.mak&quot; in both the lib and src&\#092;text directories.
+The makefiles may need some work depending on your compiler.
+
+<p><br>
+
+<h3>Bugs</h3>
+
+<p>Please report problems specific to <i>MG-1.3</i> to the <a
+href="mailto:nzdl@cs.waikato.ac.nz">New Zealand Digital Library
+administrator</a>. For general problems mail the
+<a href="http://www.cs.mu.oz.au/mg/"><i>MG</i>
+mailing list</a> which services a community of experienced <i>MG</i>
+users.
+}
Index: /trunk/gsdl/macros/people.dm
===================================================================
--- /trunk/gsdl/macros/people.dm	(revision 876)
+++ /trunk/gsdl/macros/people.dm	(revision 876)
@@ -0,0 +1,84 @@
+package people
+
+
+#######################################################################
+# java images/scripts
+#######################################################################
+
+# the _javalinks_ macros are the flashy image links at the top right of
+# the page. 
+
+_javalinks_ {_imagehome_}
+_javalinks_ [v=1] {
+_imagehome_<br>
+}
+
+
+#######################################################################
+# icons
+#######################################################################
+
+_iconhpeople_ {<img src="_httpiconhpeople_" width=_widthhpeople_ height=_heighthpeople_}
+
+#######################################################################
+# http macros 
+#
+# These contain the url without any quotes
+#######################################################################
+
+_httpiconhpeople_ {_httpimg_/h\_people.gif}
+_widthhpeople_ {200}
+_heighthpeople_ {57}
+
+
+#######################################################################
+# page content
+#######################################################################
+
+_pagetitle_ {_textpagetitle_}
+
+_imagethispage_ {_iconhpeople_}
+
+
+_content_ {
+_iconblankbar_
+<table border=0 cellpadding=5>
+<tr><td valign=top>
+_textsawnzdl_
+<br>
+_textstafftable_(width=200)
+</td></tr>
+
+<tr><td valign=top>
+_texttrsaawp_
+<br>
+_textgstable_(width=200)
+</td></tr>
+
+<tr><td valign=top>
+_textaffiliates_
+<br>
+_textaffiliatetable_(width=200)
+</td></tr>
+
+<tr><td valign=top>
+
+_texttpcsp_
+<br>
+_textconttable_(width=200)
+</table>
+}
+
+
+###############################################################################
+# English Language Text Macros
+###############################################################################
+
+
+#moved to english.dm
+
+
+
+
+
+
Index: /trunk/gsdl/macros/pref.dm
===================================================================
--- /trunk/gsdl/macros/pref.dm	(revision 875)
+++ /trunk/gsdl/macros/pref.dm	(revision 876)
@@ -1,3 +1,13 @@
 package preferences
+
+# set within server
+
+# collectionoption is only set when cross-collection searching is turned on
+_collectionoption_ {}
+
+# this macro will be set to "1" when the "source docs retrived from dl/web
+# button is required - i.e. whenever PreferenceDocsFromWeb isn't set to false
+# in collect.cfg
+_PreferenceDocsFromWeb_ {}
 
 
@@ -24,88 +34,164 @@
 #######################################################################
 
+_ccsfunctions_ {argcc = "";
+savedccs = new Object();
+
+function initialize () \{
+  for (i = 0; i < document.links.length; i++)
+    savedhrefs[i] = document.links[i].href;
+
+  s = "_cgiargcc_";
+  a = s.split (",");
+  for (i = 0; i < a.length ;i++) \{
+    for (j = 0; j < document.PrefForm.cc.length; j++) \{
+      if (a[i] == document.PrefForm.elements["cc"][j].value) \{
+        document.PrefForm.elements["cc"][j].checked = true;
+        savedccs[a[i]] = 1;
+        argcc = argcc + "&cc=" + a[i];
+        break;
+      \} else \{
+        savedccs[a[i]] = 0;
+      \}
+    \}
+  \}
+  updatehrefs();
+\}
+
+function updatecc (collection) \{
+  if (savedccs[collection] == 1) savedccs[collection] = 0;
+  else savedccs[collection] = 1;
+		
+  var i;
+  argcc = "";
+  for (i in savedccs)
+    if (savedccs[i] == 1) argcc += "&cc=" + i;
+  updatehrefs();
+\}
+}
+
+_standardfunctions_ {
+function initialize () \{
+  for (i = 0; i < document.links.length; i++)
+    savedhrefs[i] = document.links[i].href;
+\}
+}
+
+_getargsfunction_ {
+function getargs () \{
+  return argk + args + argm + argo + argb_If_('_cgiargccs_ == 1',_ccsargs_)_If_(_htmloptions_,_htmlargs_);
+\}
+}
+
+_ccsargs_ {+ argcc}
+_htmlargs_ {+ argel + argil + argfc + arghl}
+
+_htmlfunctions_ {argel = "";
+argil = "";
+argfc = "";
+arghl = "";
+
+function updateel () \{
+  value = document.PrefForm.el.options[document.PrefForm.el.selectedIndex].value;
+  if (value != "_cgiargel_") argel = "&el=" + value;
+  else argel = "";
+  updatehrefs();
+\}
+
+function updateil () \{
+  value = document.PrefForm.il.options[document.PrefForm.il.selectedIndex].value;
+  if (value != "_cgiargil_") argil = "&il=" + value;
+  else argil = "";
+  updatehrefs();
+\}
+
+function updatefc () \{
+  if (document.PrefForm.fc.checked)
+    _If_("_cgiargfc_" eq "1",_argfcblank_,_argfcon_)
+  else 
+    _If_("_cgiargfc_" ne "1",_argfcblank_,_argfcoff_)
+  updatehrefs();
+\}
+
+function updatehl () \{
+  if (document.PrefForm.hl.checked)
+    _If_("_cgiarghl_" eq "1",_arghlblank_,_arghlon_)
+  else 
+    _If_("_cgiarghl_" ne "1",_arghlblank_,_arghloff_)
+  updatehrefs();
+\}
+}
+
+_argfcblank_ {argfc = "";}
+_argfcon_ {argfc = "&fc=1&f=1";}
+_argfcoff_ {argfc = "&fc=0&f=0";}
+
+_arghlblank_ {arghl = "";}
+_arghlon_ {arghl = "&hl=1";}
+_arghloff_ {arghl = "&hl=0";}
+
 _pagescriptextra_ {
 // preferences scripts generated from \_preferences:pagescriptextra\_
 
-	savedhrefs = new Object();
-
-	argk = "";
-	args = "";		
-	argm = "";
-	argo = "";
-	argb = "";
-        argel = "";
-        argil = "";
-
-	function initialize () \{
-		for (i = 0; i < document.links.length; i++)
-			savedhrefs[i] = document.links[i].href;
-	\}
-
-	function updatehrefs () \{
-		for (i = 0; i < document.links.length; i++)
-			document.links[i].href = savedhrefs[i] + argk + args + argm + argo + argb + argel + argil;
-	\}
-
-	function updatek (value) \{
-		if (value != _cgiargk_) argk = "&k=" + value;
-		else argk = "";
-		updatehrefs();
-	\}
-
-	function updates (value) \{
-		if (value != _cgiargs_) args = "&s=" + value;
-		else args = "";
-		updatehrefs();
-	\}
-
-	function updatem () \{
-		value = document.PrefForm.m.options[document.PrefForm.m.selectedIndex].value;
-		if (value != _cgiargm_) argm = "&r=1&m=" + value;
-		else argm = "";
-		updatehrefs();
-	\}
-
-	function updateo () \{
-		value = document.PrefForm.o.options[document.PrefForm.o.selectedIndex].value;
-		if (value != _cgiargo_) argo = "&r=1&o=" + value;
-		else argo = "";
-		updatehrefs();
-	\}
-
-	function updateb (value) \{
-		if (value != _cgiargb_) argb = "&b=" + value;
-		else argb = "";
-		updatehrefs();
-	\}
-
-	function updateel () \{
-		value = document.PrefForm.el.options[document.PrefForm.el.selectedIndex].value;
-		if (value != "_cgiargel_") argel = "&el=" + value;
-		else argel = "";
-		updatehrefs();
-	\}
-
-	function updateil () \{
-		value = document.PrefForm.il.options[document.PrefForm.il.selectedIndex].value;
-		if (value != "_cgiargil_") argil = "&il=" + value;
-		else argil = "";
-		updatehrefs();
-	\}
-
-	function updatel () \{
-		value = document.PrefForm.l.options[document.PrefForm.l.selectedIndex].value;
-		location.href = location.href + argk + args + argm + argo + argb + argel + argil + "&l=" + value;
-	\}
-
-	function updatev () \{
-		value = document.PrefForm.v.options[document.PrefForm.v.selectedIndex].value;
-		location.href = location.href + argk + args + argm + argo + argb + argel + argil + "&v=" + value;
-	\}
-
-	function updatew () \{
-		value = document.PrefForm.w.options[document.PrefForm.w.selectedIndex].value;
-		location.href = location.href + argk + args + argm + argo + argb + argel + argil + "&nw=" + value;
-	\}
-
+savedhrefs = new Object();
+
+argk = "";
+args = "";		
+argm = "";
+argo = "";
+argb = "";
+_If_('_cgiargccs_ == 1',_ccsfunctions_,_standardfunctions_)
+_If_(_htmloptions_,_htmlfunctions_)
+_getargsfunction_
+function updatehrefs () \{
+  for (i = 0; i < document.links.length; i++)
+    document.links[i].href = savedhrefs[i] + getargs();
+\}
+
+function updatek (value) \{
+  if (value != _cgiargk_) argk = "&k=" + value;
+  else argk = "";
+  updatehrefs();
+\}
+
+function updates (value) \{
+  if (value != _cgiargs_) args = "&s=" + value;
+  else args = "";
+  updatehrefs();
+\}
+
+function updatem () \{
+  value = document.PrefForm.m.options[document.PrefForm.m.selectedIndex].value;
+  if (value != _cgiargm_) argm = "&r=1&m=" + value;
+  else argm = "";
+  updatehrefs();
+\}
+
+function updateo () \{
+  value = document.PrefForm.o.options[document.PrefForm.o.selectedIndex].value;
+  if (value != _cgiargo_) argo = "&r=1&o=" + value;
+  else argo = "";
+  updatehrefs();
+\}
+
+function updateb (value) \{
+  if (value != _cgiargb_) argb = "&b=" + value;
+  else argb = "";
+  updatehrefs();
+\}
+
+function updatel () \{
+  value = document.PrefForm.l.options[document.PrefForm.l.selectedIndex].value;
+  location.href = location.href + "&l=" + value + getargs();
+\}
+
+function updatev () \{
+  value = document.PrefForm.v.options[document.PrefForm.v.selectedIndex].value;
+  location.href = location.href + "&v=" + value + getargs();
+\}
+
+function updatew () \{
+  value = document.PrefForm.w.options[document.PrefForm.w.selectedIndex].value;
+  location.href = location.href + "&nw=" + value + getargs();
+\}
 }
 
@@ -133,4 +219,17 @@
 _pagetitle_ {_collectionname_: _textpreferences_}
 _imagethispage_ {_iconthispage_}
+
+_htmloptions_ {}
+
+_htmloptionson_ {
+<p>
+_fcoption_
+<p>
+_hloption_
+<p>
+_extlinkoption_
+_If_(_PreferenceDocsFromWeb_,<p>
+_intlinkoption_)
+}
 
 _caseoption_ {
@@ -141,11 +240,21 @@
 }
 
+_fcoption_ {
+<input type=checkbox name=fc onClick="updatefc();"_If_("_cgiargfc_" eq "1", checked)> 
+_textfcoption_
+}
+
+_hloption_ {
+<input type=checkbox name=hl onClick="updatehl();"_If_("_cgiarghl_" eq "1", checked)> 
+_texthloption_
+}
+
 _caseoption_ [l=zh] {}
 
 _stemoption_ {
 <input type=radio name=s value=1 onClick="updates(1);"
-		_If_(_cgiargs_, checked)>_textstem_<br>
+  _If_(_cgiargs_, checked)>_textstem_<br>
 <input type=radio name=s value=0 onClick="updates(0);"
-		_If_(_cgiargs_,, checked)>_textnostem_
+  _If_(_cgiargs_,, checked)>_textnostem_
 }
 
@@ -165,5 +274,5 @@
   <option value="20"_If_("_cgiargo_" eq "20", selected)>20
   <option value="50"_If_("_cgiargo_" eq "50", selected)>50
-  <option value="100")_If_("_cgiargo_" eq "100", selected)>all
+  <option value="100")_If_("_cgiargo_" eq "100", selected)>_textall_
 </select>
 }
@@ -180,7 +289,7 @@
 <select name="el" onChange="updateel();">
   <option value="prompt"_If_("_cgiargel_" eq "prompt", selected)>
-     through intermediate page
+     _textlinkinterm_
   <option value="direct"_If_("_cgiargel_" eq "direct", selected)>
-     go directly there
+     _textlinkdirect_
 </select>
 }
@@ -190,19 +299,15 @@
 <select name="il" onChange="updateil();">
   <option value="l"_If_("_cgiargil_" eq "l", selected)>
-     the digital library
+     _textdigitlib_
   <option value="w"_If_("_cgiargil_" eq "w", selected)>
-     the Web
-</select>
-}
-
-
-_languageoption_ {
-_textlanguage_
-<select name="l" onChange="updatel();">
-  <option value="en"_If_("_cgiargl_",, selected)_If_("_cgiargl_" eq "en", selected)>English
-  <option value="mi"_If_("_cgiargl_" eq "mi", selected)>M&auml;ori
-  <option value="zh"_If_("_cgiargl_" eq "zh", selected)>Chinese
-</select>
-}
+     _textweb_
+</select>
+}
+
+_languageoption_ {}
+
+_enlanguageoption_ {<option value="en"_If_("_cgiargl_",, selected)_If_("_cgiargl_" eq "en", selected)>_textlangeng_}
+_milanguageoption_ {<option value="mi"_If_("_cgiargl_" eq "mi", selected)>_textlangmaori_}
+_zhlanguageoption_ {<option value="zh"_If_("_cgiargl_" eq "zh", selected)>_textlangchinese_}
 
 _encodingoption_ {
@@ -231,32 +336,9 @@
 <form name=PrefForm method=get action="_gwcgi_">
 
-<input type="hidden" name="e" value="_compressedoptions_">
-
-<p>
-_caseoption_
-
-<p>
-_stemoption_
-
-<p>
-_textprefop_
-
-<p>
-_modeoption_
-
-<p>
-_extlinkoption_
-
-<p>
-_intlinkoption_
-
-<p>
-_languageoption_
-
-<p>
-_encodingoption_
-
-<p>
-_formatoption_
+<input type="hidden" name="e" value="_decodedcompressedoptions_">
+
+_If_(_collectionoption_,_collectionprefs_)
+_presentationprefs_
+_searchprefs_
 
 </blockquote>
@@ -264,4 +346,40 @@
 }
 
+_searchprefs_ {
+<h3>_textsearchprefs_</h3>
+<p>
+_caseoption_
+
+<p>
+_stemoption_
+
+<p>
+_modeoption_
+
+<p>
+_textprefop_
+<br>_iconblankbar_
+}
+
+_collectionprefs_ {
+<h3>_textcollectionprefs_</h3>
+_collectionoption_
+<br>_iconblankbar_
+}
+
+_presentationprefs_ {
+<h3>_textpresentationprefs_</h3>
+_htmloptions_
+
+<p>
+_languageoption_
+
+<p>
+_encodingoption_
+
+<p>
+_formatoption_
+<br>_iconblankbar_
+}
 
 #######################################################################
@@ -284,60 +402,8 @@
 
 
-#######################################################################
-# english macros
-#######################################################################
-
-_textpreferences_ {Preferences}
-_textignorecase_ { ignore case differences}
-_textmatchcase_ { upper/lower case must match}
-_textstem_ { ignore word endings}
-_textnostem_ { whole word must match}
-_textprefop_ {Return up to _maxdocoption_ hits with _hitsperpageoption_ hits per page.}
-_textextlink_ {Access to external Web pages: }
-_textintlink_ {Source documents retrieved from:}
-_textlanguage_ {Interface language: }
-_textencoding_ {Encoding: }
-_textformat_ {Interface format: }
-_textsimplemode_ {simple query mode}
-_textadvancedmode_ {advanced query mode (allows boolean searching using !, &, |, and parenthesis)}
-_textgraphical_ {Graphical}
-_texttextual_ {Textual}
-
-
-#######################################################################
-# chinese macros
-#######################################################################
-_textintlink_ [l=zh] {}
-_textextlink_ [l=zh] {}
-
-_textprefop_ [l=zh] {æ¥è¯¢æå€è¿åã
-ã _maxdocoption_ è®°åœïŒæ¯é¡µè¿å
-_hitsperpageoption_ è®°åœ}
-_textlanguage_ [l=zh] {çé¢è¯­èšïŒ}
-_textsimplemode_ [l=zh] {ç®åæ¥è¯¢æ¹åŒ}
-_textadvancedmode_ [l=zh] {é«çº§æ¥è¯¢æ¹åŒ(å¯ä»¥äœ¿çš !ã&ã| åæ¬å·æ¥è¿è¡åžå°æ¥è¯¢)}
-_textencoding_ [l=zh] {çŒç æ¹åŒïŒ}
-_textformat_ [l=zh] {çé¢æ ŒåŒïŒ}
-
-#######################################################################
-# maori macros
-#######################################################################
-
-_textpreferences_ [l=mi] {Whiriwhiringa}
-_textignorecase_ [l=mi] { hei aha te p&uuml; matua me te p&uuml; iti}
-_textmatchcase_ [l=mi] { me tika te p&uuml; matua me te p&uuml; iti}
-_textstem_ [l=mi] { hei aha te k&uuml;muri}
-_textnostem_ [l=mi] { me tika te k&uuml;muri}
-_textprefop_ [l=mi] {Whakahokia mai te _maxdocoption_ kupu, &auml;, kia _hitsperpageoption_ kupu ki ia wh&auml;rangi.}
-_textlanguage_ [l=mi] {Reo: }
-_textencoding_ [l=mi] {Whakatakotoranga p&uuml;: }
-_textformat_ [l=mi] {Whakatakotoranga wh&auml;rangi: }
-_textsimplemode_ [l=mi] {te rapu wh&auml;iti}
-_textadvancedmode_ [l=mi] {te rapu wh&auml;nui (ka taea te whakamahia ng&auml; p&uuml; boolean, 
-p&euml;r&auml; i te !, &, |, me te "()" hoki)}
-_textgraphical_ [l=mi] {Whakaahua}
-_texttextual_ [l=mi] {K&auml;ore he whakaahua}
-
-
-
-
+
+
+
+
+
+
Index: /trunk/gsdl/macros/prescrpt.dm
===================================================================
--- /trunk/gsdl/macros/prescrpt.dm	(revision 876)
+++ /trunk/gsdl/macros/prescrpt.dm	(revision 876)
@@ -0,0 +1,223 @@
+package prescript
+
+
+#######################################################################
+# java images/scripts
+#######################################################################
+
+# the _javalinks_ macros are the flashy image links at the top right of
+# the page. 
+
+_javalinks_ {_imagehome_}
+_javalinks_ [v=1] {
+_imagehome_<br>
+}
+
+
+#######################################################################
+# icons
+#######################################################################
+
+_iconhpscrpt_ {<img src="_httpiconhpscrpt_" width=_widthhpscrpt_ height=_heighthpscrpt_}
+
+#######################################################################
+# http macros 
+#
+# These contain the url without any quotes
+#######################################################################
+
+_httpiconhpscrpt_ {_httpimg_/h\_pscrpt.gif}
+_widthhpscrpt_ {200}
+_heighthpscrpt_ {57}
+
+
+#######################################################################
+# page content
+#######################################################################
+
+_pagetitle_ {NZDL: PreScript}
+
+_imagethispage_ {_iconhpscrpt_}
+
+_content_ {
+_iconblankbar_
+<p><i>PreScript</i> offers:
+
+<dl>
+<dt><b>PostScript conversion to plain ASCII or HTML.</b></dt>
+
+<dd><i>PreScript</i> is really a PostScript to plain text converter,
+but rudimentary HTML can also be produced.  Tags are inserted to mark
+paragraphs (&lt;p&gt;), short lines (&lt;br&gt;), page breaks
+(&lt;hr&gt;), and header and footers (italisized with
+&lt;i&gt;...&lt;/i&gt;).
+
+<dt><b>Paragraph boundaries detection.</b></dt>
+<dd><i>PreScript</i> determines the line spacing of a document and
+uses this (and also indentations) to determine paragraph boundaries. 
+
+<dt><b>Hyphenation removal.</b></dt>
+<dd>Hyphenated words are de-hyphenated.
+
+<dt><b>Ligature translation.</b></dt>
+<dd>Most ligatures used by TeX document are detected.
+<i>PreScript</i> doesn't track font changes making it impossible to
+reliablely detect all ligatures.
+
+</dl>
+<br>
+<h3>Installing PreScript</h3>
+<i>PreScript</i> is written in PostScript and Python.  You will
+need <a href="http://www.cs.wisc.edu/~ghost">Ghostscript</a> (at least
+version 4.01) and the
+<a href="http://www.python.org">Python</a> interpreter (at least
+version 1.4.).
+
+<h4>The PreScript 0.1 distribution</h4>
+
+This distribution is the most stable - it is what you should use to
+do real work.
+
+<ul>
+
+<li>Download the <a href="http://www.nzdl.org/technology/prescript-0.1.tar.gz">PreScript
+0.1</a> distribution.
+
+<li>Define the environment variable <tt>PRESCRIPT_DIR</tt> to the
+directory where <i>PreScript</i> is installed (or where ever you put
+<tt>prescript.ps</tt>).
+
+<li>Move <tt>prescript.py</tt> to a directory listed in your
+<tt>PATH</tt> environment variable.  You may want to remove the
+<tt>.py</tt> suffix (<tt>prescript.py</tt> can be either a standalone
+program, or an imported library of another Python program).
+
+<li>Change <tt>\#! /usr/local/bin/python</tt> in
+<tt>prescript.py</tt> to the location of your Python interpreter.
+
+</ul>
+
+<h4>The PreScript 2 distribution</h4>
+
+This is a beta release of our latest version. This version is a lot cleaner and
+faster; it is also extensible (users can write their own renderers), 
+better documented, and contains better prediction of line, paragraph, 
+and page breaks. If you notice any bugs, want to request new
+features, or want to become a beta tester please email the <a
+href="mailto:nzdl@cs.waikato.ac.nz">New Zealand Digital Library
+administrator</a>.
+
+<ul>
+
+<li>Download a <i>PreScript 2</i> distribution (the later versions are more stable).
+
+<blockquote>
+<a href="http://www.nzdl.org/technology/prescript-2.0.tar.gz">PreScript 2.0</a><br>
+<a href="http://www.nzdl.org/technology/prescript-2.1.tar.gz">PreScript 2.1</a><br>
+<a href="http://www.nzdl.org/technology/prescript-2.2.tar.gz">PreScript 2.2</a> -- same as Prescript 2.1 but compatibility issues
+with python 1.5 have been fixed
+</blockquote>
+
+<li>On unix systems 'make install' will install prescript to /usr/local/bin. It will
+also install the accompanying manual page (to install somewhere else simply edit
+the Makefile).
+
+<li>If not installing with the make utility:<br>
+It is easiest if all of the program scripts are kept in the same directory,
+which ideally should be listed in the <tt>PATH</tt> environment variable.  If
+this is inconvenient, be sure that <tt>PRESCRIPT_DIR</tt> points to where
+<tt>prescript.ps</tt> is installed, and that <tt>PYTHONPATH</tt> points to
+where <tt>*.py</tt> are installed.
+
+<li>Change <tt>\#!/usr/local/bin/python</tt> in <tt>prescript</tt> to the
+location of your Python interpreter ('make install' does NOT do this for you).
+
+</ul>
+<br>
+
+<h3>Running PreScript</h3>
+<b>Usage:</b>
+<blockquote>
+prescript <i>format</i> <i>input</i> [<i>output</i>]
+</blockquote>
+
+<ul>
+<li><i>format</i> is either <tt>plain</tt> or <tt>html</tt>.
+<li><i>input</i> is the input filename, a PostScript file.
+<li><i>output</i> is the output filename.  By default, the output file
+name is the same as the input filename with the path removed and suffix
+replace to either <tt>.txt</tt> or <tt>.html</tt>.
+</ul>
+
+<br>
+<h3>Bugs</h3>
+Please report bugs to the <a
+href="mailto:nzdl@cs.waikato.ac.nz">New Zealand Digital Library
+administrator</a>.
+<p><br>
+
+<h3>Notes</h3>
+<i>PreScript</i> is a port of a Perl program used by the New Zealand Digital
+Library project to convert computer science technical reports to HTML.  The
+Perl version is deemed unfit for a public release because the code is quite
+messy (a consequence of Perl's cumbersome syntax for defining objects).  The
+Python version is considerably easier to understand, maintain, and extend.  
+The technical paper <a
+href="http://www.nzdl.org/technology/prescript.ps.gz">prescript.ps.gz</a> documents the
+algorithms and heuristics used in <i>PreScript 0.1</i> - there is an
+update to this for <i>PreScript 2</i> inside its distribution 
+archive.<p><br>
+
+<h3>Other Postscript Converters</h3>
+Here is a summary of other PostScript to text converters we found.
+
+<dl>
+<dt><a
+href="http://www.research.digital.com/SRC/virtualpaper/pstotext.html"><b>pstotext</b></a></dt>
+
+
+<dd>From the DEC Virtual Paper research project.  PostScript program
+and C program.  Probably the best PostScript to text converter (after
+<i>PreScript</i>, of course).
+
+<dt><a
+href="http://stasi.bradley.edu/ftp/pub/ps2html/ps2html-v2.html"><b>ps2html,
+The Sequel</b></a></dt>
+
+<dd>Developed at John Hopkins University to convert JHU journal
+articals to HTML.  This converter attempts to preserve the formatting
+of the original PostScript document, but is tied to PostScript
+files generated with a specific package (QuarkXPress?).  A table
+describing a number of parameters is used to aid conversion and can be
+modified for new formats.  Uses a variation of Ghostscript's
+<tt>ps2ascii.ps</tt>.
+
+<dt><b>ps2ascii.ps</b></dt>
+
+<dd>Part of the Ghostscript distribution.  <tt>ps2ascii.ps</tt> is
+considerably less robust than <i>PreScript</i>.
+
+<dt><a
+href="ftp://ftp.mpce.mq.edu.au/pub/comp/src/ps2a.sh"><b>ps2a.sh</b></a></dt>
+
+<dd>A PostScript program similar to Ghostscript's <tt>ps2ascii.ps</tt>.
+
+<dt><a href="ftp://apocalypse.engr.ucf.edu:/usr/ssd/ps2ascii.shar"><b>ps2ascii.shar</b></a></dt>
+
+<dd>A PostScript program and Perl script.
+
+<dt><a
+href="ftp://wilma.cs.brown.edu/pub/postscript/ps2ascii.pl"><b>ps2ascii.pl</b></a></dt>
+
+<dd>A Perl script that extracts parenthesized text from a PostScript
+file.
+
+<dt><a
+href="ftp://ftp.funet.fi/pub/archive/alt.sources/volume92/Feb/920223.01.gz"><b>ps2txt</b></a></dt>
+
+<dd>A stand alone C program that extracts parenthesized text.  Some
+special code to deal with <tt>dvips</tt> generated files.
+
+</dl>
+
+}
Index: /trunk/gsdl/macros/query.dm
===================================================================
--- /trunk/gsdl/macros/query.dm	(revision 875)
+++ /trunk/gsdl/macros/query.dm	(revision 876)
@@ -77,5 +77,5 @@
 
 <input type=hidden name="a" value="q">
-<input type=hidden name="e" value="_compressedoptions_">
+<input type=hidden name="e" value="_decodedcompressedoptions_">
 <input type=hidden name="r" value="1">
 
@@ -112,45 +112,6 @@
 #######################################################################
 
-_textquerytitle_ {_If_(_thislast_,results _thisfirst_ - _thislast_ for query: _cgiargq_,No matches for query: _cgiargq_}
-_textnoquerytitle_ {Search page}
+# moved to english.dm
 
-_texticonthispage_ {search}
-_textsome_ {_If_(_cgiargb_,ranked,some)}
-_textall_ {_If_(_cgiargb_,boolean,all)}
-_texticonqueryresultsbar_ {}
-_textfreqmsg1_ {Word count: }
-_textpostprocess_ {_If_(_quotedquery_,<br><i>post-processed to find _quotedquery_</i>
-)}
-
-_textmorethan_ {More than }
-_textapprox_ {About }
-_textnodocs_ {No documents matched the query.}
-_text1doc_ {1 document matched the query.}
-_textlotsdocs_ {documents matched the query.}
-_textmatches_ {Matches }
-_textbeginsearch_ {Begin Search}
-
-# the textselect macro may need to be overridden for some collections
-# _hselection_, _jselection_ and _nselection_ are set from within the server
-# some or all of them may remain unset
-_textselect_ {_If_(_cgiargb_,_textadvancedsearch_,_textsimplesearch_)}
-
-_defaultindextext_ { all text }
-_textsimplesearch_ {Search for _If_(_hselection_, _hselection_, _defaultindextext_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) 
-which contain _querytypeselection_ of the words}
-
-_textadvancedsearch_ {Search_If_(_hselection_, _hselection_, _defaultindextext_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) 
-using _querytypeselection_ query}
-
-_textjselect_ {_If_(_hselection_, of) _jselection_}
-
-_querytypeselection_ {
-<select name="t">
-<option value="1"_If_(_cgiargt_, selected)>_textsome_
-<option value="0"_If_(_cgiargt_,, selected)>_textall_
-</select>
-}
-
-_textstemon_ { (ignoring word endings)}
 
 
@@ -159,18 +120,18 @@
 #######################################################################
 
-_texticonthispage_ [l=mi] {rapu}
-_textsome_ [l=mi] {&euml;tehi}
-_textall_ [l=mi] {_If_(_cgiargb_,te boolean,katoa)}
-_textbeginsearch_ [l=mi] {Rapua}
-_textfreqmsg1_ [l=mi] {Kia hia ng&auml; kupu: }
-_textmorethan_ [l=mi] {Neke atu i te }
-_textnodocs_ [l=mi] {k&auml;ore he pukapuka e p&auml; ana ki &auml;u kupu rapu.}
-_text1doc_ [l=mi] {1 te pukapuka e p&auml; ana ki &auml;u kupu rapu.}
-_textlotsdocs_ [l=mi] {ng&auml; pukapuka e p&auml; ana ki &auml;u kupu rapu.}
-_textmatches_ [l=mi] {Kitenga }
-_textstemon_ [l=mi] { (hei aha te k&uuml;muri)}
+#moved to  maori.dm
 
-_textsimplesearch_ [l=mi] {Tirohia ki _If_(_hselection_, _hselection_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) m&ouml; _querytypeselection_ o ng&auml; kupu}
 
-_textadvancedsearch_ [l=mi] {Tirohia ki_If_(_hselection_, _hselection_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) 
-m&ouml; _querytypeselection_ o ng&auml; kupu}
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/gsdl/macros/rw.dm
===================================================================
--- /trunk/gsdl/macros/rw.dm	(revision 876)
+++ /trunk/gsdl/macros/rw.dm	(revision 876)
@@ -0,0 +1,248 @@
+package rw
+
+#######################################################################
+# java images/scripts
+#######################################################################
+
+# the _javalinks_ macros are the flashy image links at the top right of
+# the page. 
+
+_javalinks_ {_imagehome_}
+_javalinks_ [v=1] {
+_imagehome_<br>
+}
+
+
+#######################################################################
+# icons
+#######################################################################
+
+_iconhrw_ {<img src="_httpiconhrw_" width=_widthhrw_ height=_heighthrw_}
+
+_iconcomment_ {<img src=_httpiconcomment_ border=0>}
+
+#######################################################################
+# http macros 
+#
+# These contain the url without any quotes
+#######################################################################
+
+_httpiconhrw_ {_httpimg_/h\_rw.gif}
+_widthhrw_ {200}
+_heighthrw_ {57}
+
+_httpiconcomment_ {_httpimg_/comment.gif}
+
+#######################################################################
+# page content
+#######################################################################
+
+_pagetitle_ {NZDL: Related Work}
+
+_imagethispage_ {_iconhrw_}
+
+_content_ {
+_iconblankbar_
+<p>_textcomdesc_
+<p>
+<table>
+<tr><td></td><th>_textdl_</th><th>_textcst_</th></tr>
+<tr><th valign=top>_textsys_</th>
+
+<td valign=top border>
+_textsystemsdllist_</td>
+      
+<td valign=top>
+_textsystemscslist_</td>
+</tr>
+
+<tr><th valign=top>_textli_</th><td valign=top>
+_textlistsdllist_</td>
+
+<td valign=top>
+_textlistscslist_</td>
+</tr>
+</table>
+<hr>
+_textetclist_
+}
+
+ 
+_pagecontent_[version=text] {
+_textcomdesc_
+<p>
+
+<ul><h3><b><u>_textdl_</u></b></h3>
+    <ul><h3><b>_textsys_</b></h3>
+        <ul>_textsystemsdllist_</ul>
+        <h3><b>_textli_</b></h3>
+        <ul>_textlistsdllist_</ul>
+    </ul>
+</ul>
+<br>
+<ul><h3><b><u>_textcst_</u></b></h3>
+    <ul><h3><b>_textsys_</b></h3>
+        <ul>_textsystemscslist_</ul>
+        <h3><b>_textli_</b></h3>
+        <ul>_textlistscslist_</ul>
+    </ul>
+</ul>    
+<hr>
+_textetclist_
+}
+
+
+###############################################################################
+# English Language Text Macros
+###############################################################################
+
+_textdl_ {Digital Libraries}
+_textcst_ {CS TechReports}
+
+_textsystemsdllist_ {
+    <li><a href=http://www.informedia.cs.cmu.edu>CMU (Informedia)</a></li>
+    <li><a href=http://diglib.stanford.edu>Stanford</a>
+       <a href="http://www.nzdl.org/others/stanford.html">_iconcomment_</a></li>
+    <li><a href=http://elib.cs.berkeley.edu>Berkeley</a></li>
+    <li><a href=http://sunsite.berkeley.edu>Berkeley Library</a></li>
+    <li><a href=http://alexandria.sdc.ucsb.edu>
+        Santa Barbara (Alexandria)</a></li>
+    <li><a href=http://www.library.uiuc.edu/dli>Illinois</a></li>
+    <li><a href=http://www.si.umich.edu/UMDL>Michigan</a>
+    <li><a href=http://www.loc.gov>Library of Congress</a></li>
+    <li><a href=http://www.music.indiana.edu/variations> Music from Indiana</a>
+    <li><a href=http://www.ul.cs.cmu.edu>Universal Library project</a>
+        <a href="http://www.nzdl.org/others/ulp.html"> _iconcomment_</a>
+   <li><a href=http://www.perseus.tufts.edu>Perseus (Greek Culture)</a></li>
+  <li><a href=http://hypatia.dcs.qmw.ac.uk>Hypatia</a>
+    <a href="http://www.nzdl.org/others/Hypat1.html">_iconcomment_</a></li>
+    <li><a href=http://www.bids.ac.uk/elib/infobike/homepage.html\#H5>BIDS - Infobike</a>
+    <a href="http://www.nzdl.org/others/Infobike.html">_iconcomment_</a> 
+    </li>
+    <li><a href=http://www.columbia.edu/acis/bartleby/>Columbia University Bartleby Library</a>
+    <a href="http://www.nzdl.org/others/bartleby.html">_iconcomment_</a> 
+    <li><a href=http://xxx.lanl.gov/>Physics e-print archive</a>
+    <a href="http://www.nzdl.org/others/physics.html">_iconcomment_</a> 
+    </li>
+}
+
+_textsystemscslist_ {
+    <li><a href=http://www.ncstrl.org>NCSTRL</a>
+        <a href="http://www.nzdl.org/others/ncstrl.html">_iconcomment_</a> 
+    </li>
+    <li><a href=http://www.cs.indiana.edu:800/cstr/search>UCSTRI</a>
+    <a href="http://www.nzdl.org/others/ucstri.html">_iconcomment_</a>
+        </li>
+    <li><a href=http://medoc.informatik.tu-muenchen.de>MEDOC</a>
+<a href="http://www.nzdl.org/others/medoc.html">_iconcomment_</a> 
+</li>
+    <li><a href=http://liinwww.ira.uka.de/bibliography>
+        Karlsruhe bibliographies</a>
+        <a href="http://www.nzdl.org/others/Karlsruhe.html">_iconcomment_</a> </li>
+    <li><a href=http://techreports.larc.nasa.gov/cgi-bin/NTRS>
+        NTRS (NASA)</a></li>
+<a href="http://www.nzdl.org/others/ntrs.html">_iconcomment_</a> 
+    <li><a href=http://elib.stanford.edu>Stanford Electronic Library</a>
+        <a href="http://www.nzdl.org/others/stanford\_elib.html">_iconcomment_</a>
+    </li>
+    <li><a href=http://harvest.cs.colorado.edu>Harvest</a>
+<a href="http://www.nzdl.org/others/harvest.html">_iconcomment_</a> 
+</li>
+}
+
+_textsys_ {Systems}
+_textli_ {Lists}
+
+_textlistsdllist_ {
+  <li><a href=http://www.cs.jhu.edu/~lin/dlib/extensive-info.html>
+      John Hopkins (extensive)</a></li>
+  <li><a href=http://www.yahoo.com/Reference/Libraries/Information_Science/Digital_Libraries>
+      Yahoo!</a></li>
+  <li><a href=http://www.acm.org/eccc/projects/diglib.html>
+      Digital Library Initiative</a></li>
+  <li><a href=http://www.ua.ac.be/WGLIB/digital.html>Antwerp</a></li>
+  <li><a href=http://www.tntech.edu/www/acad/hist/diglibs.html>
+      Tennessee</a></li>
+  <li><a href=http://bones.wcupa.edu/~sbentley/libproj.html>
+      CACM April 1995</a></li>
+  <li><a href=http://www.englib.cornell.edu/ccr/dl_outline.html>
+      Cornell (long)</a></li>
+}
+
+_textlistscslist_ {
+  <li><A HREF=http://www.larc.nasa.gov/org/library/abs-tr.html>
+      NASA</a></li>
+  <li><A HREF=http://www.yahoo.com/Science/Computer_Science/Technical_Reports>
+      Yahoo!</a></li>
+  <li><a href=http://www.rdt.monash.edu.au/tr/siteslist.html>
+      CSTR Archive Sites</a></li>
+  <li><a href=http://cs-tr.cs.cornell.edu/Info/other_sources.html>
+      Cornell TR site list</a></li>
+  <li><a href=http://fas.sfu.ca/1/projects/EPiCS/CS-TechReports>
+      List at Simon Fraser</a></li>
+}
+
+_textetclist_ {
+<h3>etc.:</h3><p>
+<li><a href=http://www.superjournal.ac.uk/sj>SuperJournal</a>
+<a href="http://www.nzdl.org/others/superjournal.html">_iconcomment_</a> </li>
+<li><a href=http://www.iielr.dmu.ac.uk>
+    International Institute for Electronic Library Research,
+    De Montfort University</a></li>
+<li><a href=http://www.dlib.org>D-Lib magazine</a>
+<a href="http://www.nzdl.org/others/dlib.html">_iconcomment_</a>
+</li>
+<li><a href=http://ipl.sils.umich.edu>
+    Internet Public Library (Michigan)</a>
+<a href="http://www.nzdl.org/others/pub-library.html">_iconcomment_</a>
+</li>
+<li><a href=http://www.uic.edu/orgs/tei>Text Encoding Initiative</a>
+        <a href="http://www.nzdl.org/others/summary-TEI/summary-TEI.html">_iconcomment_</a>
+</li>
+<li><a href=http://lcweb2.loc.gov/ammem>American Memory</a>
+<a href="http://www.nzdl.org/others/amerimem.html">_iconcomment_</a></li>
+<li><a href=http://sunsite.berkeley.edu/ARL/definition.html>
+    Definition and Purposes of a Digital Library</a></li>
+<li><a href=http://www.nlc-bnc.ca/cgi-bin/ifla-lwgate/DIGLIB>
+    DIGLIB mailing list</a></li>
+<li><a href=http://robotics.stanford.edu/users/ketchpel/annbib.html>
+    Annotated bibliography of DL related sources</a></li>
+<li><a href=http://www.nlc-bnc.ca/ifla>
+    International Federation of Library Associations and Institutions
+    </a></li>
+<li><a href=http://dallas.nosc.mil/diglib/index.html>US Navy</a></li>
+<h3>Internet Search Engines</h3>
+    <a href=http://www.infoseek.com>Infoseek Guide</a><br>
+    <a href=http://ultra.infoseek.com>Infoseek Ultra</a><br>
+    <a href=http://www.excite.com>Excite</a><br>
+    <a href=http://www.elibrary.com>The Electric Library</a><br>
+    <a href=http://altavista.digital.com>Alta Vista</a><br>
+    <a href=http://a2z.lycos.com>A2Z</a><br>
+    <a href=http://www.lycos.com>Lycos</a><br>
+    <a href=http://www.yahoo.com>Yahoo!</a><br>
+    <a href=http://www.hotbot.com>Hotbot</a><br>
+    <a href=http://www.100hot.com>100Hot Websites</a><br>
+    <a href=http://www.mckinley.com>Magellan</a><br>
+    <a href=http://www.opentext.com/omw/f-omw.html>OpenText</a><br>
+    <a href=http://nln.com>AccuFind</a><br>
+    <a href=http://www.pointcom.com>Point</a><br>
+    <a href=http://www.infomarket.ibm.com>IBM InfoMarket</a><br>
+    <a href=http://webcrawler.com>WebCrawler</a><br>
+
+    <h3>Unified Search Engines</h3>
+    <a href=http://www.search.com>CNET search.com</a><br>
+    <a href=http://home.netscape.com/home/internet-search.html>
+    Netscape's list</a><br>
+    <a href=http://pubweb.nexor.co.uk/public/cusi/cusi.html>
+    Configurable Unified Search Engine</a><br>
+    SavvySearch<br>
+    <a href="http://metacrawler.cs.washington.edu">MetaCrawler</a><br>
+    
+<h3>Commentaries on Search Engines</h3>
+    <a href=http://www.monash.com/spidap.html>How to use Web search engines</a><br>
+<p>
+<hr>
+}
+
+_textcomdesc_ {Click on _iconcomment_ to read a brief synopsis by one of our project members.}
+
Index: /trunk/gsdl/macros/status.dm
===================================================================
--- /trunk/gsdl/macros/status.dm	(revision 875)
+++ /trunk/gsdl/macros/status.dm	(revision 876)
@@ -40,10 +40,10 @@
 <html>
 <head>
-<title>Maintainance and Administration</title>
+<title>_titlewelcome_</title>
 </head>
 
 <frameset cols="170,*" border=0>
   <noframes><body bgcolor="#ffffff">
-  <p>You must have a frame enabled browser to view this.</p>
+  <p>_textframebrowser_</p>
   </body>
   </noframes>
@@ -59,39 +59,29 @@
 
 _If_("_cgiarguma_" ne "\_cgiarguma\_", 
-<p><b>User Management</b><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=um&uma=listusers" target=infoframe>list users</a><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=um&uma=adduser" target=infoframe>add a new user</a><br>
+<p><b>_textusermanage_</b><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=um&uma=listusers" target=infoframe>_textlistusers_</a><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=um&uma=adduser" target=infoframe>_textaddusers_</a><br>
 )
 
-<p><b>Information</b><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=status&sp=generalinfo" target=infoframe>general</a><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=status&sp=argumentinfo" target=infoframe>arguments</a><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=status&sp=actioninfo" target=infoframe>actions</a><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=status&sp=protocolinfo" target=infoframe>protocols</a>
+<p><b>_textinfo_</b><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=status&sp=generalinfo" target=infoframe>_textgeneral_</a><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=status&sp=argumentinfo" target=infoframe>_textarguments_</a><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=status&sp=actioninfo" target=infoframe>_textactions_</a><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=status&sp=protocolinfo" target=infoframe>_textprotocols_</a>
 
-<p><b>Collections</b><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=bc&bca=newcol&wizard=textinfo" target=infoframe>new collection</a><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=bc&bca=editcol" target=infoframe>edit collection</a><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=bc&bca=buildcol&wizard=buildcol" target=infoframe>build collection</a><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=bc&bca=delcol" target=infoframe>delete collection</a><br>
+<p><b>_textcollections_</b><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=bc&bca=newcol&wizard=textinfo" target=infoframe>_textnewcoll_</a><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=bc&bca=editcol" target=infoframe>_texteditcoll_</a><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=bc&bca=buildcol&wizard=buildcol" target=infoframe>_textbuildcoll_</a><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=bc&bca=delcol" target=infoframe>_textdeletecoll_</a><br>
 
 
-<p><b>Logs</b><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=status&sp=initlog" target=infoframe>init log</a><br>
-<a href="_gwcgi_?e=_compressedoptions_&a=status&sp=errorlog" target=infoframe>error log</a>
+<p><b>_textlogs_</b><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=status&sp=initlog" target=infoframe>_textinitlog_</a><br>
+<a href="_gwcgi_?e=_compressedoptions_&a=status&sp=errorlog" target=infoframe>_texterrorlog_</a>
 
 <p>
-<a href="_httppagehome_" target=_top>Return to home page</a>
+<a href="_httppagehome_" target=_top>_textreturnhome_</a>
 }
 
-_titlewelcome_ { Maintainence and Administration }
 
-_welcome_ {
-
-<p> Maintainence and administration serives available include:
-	view on-line logs; 
-	create, maintain and update collections; 
-	and access technical information suchas CGI arguments.  
-	These services are accessed using the
-	side navigation bar on the lefthand side of the page.
-}
Index: /trunk/gsdl/macros/style.dm
===================================================================
--- /trunk/gsdl/macros/style.dm	(revision 875)
+++ /trunk/gsdl/macros/style.dm	(revision 876)
@@ -49,5 +49,4 @@
 _cgihead_{}
 
-
 # htmlhead uses:
 # _1_ - extra parameters for the body tag
@@ -55,5 +54,5 @@
 # _globalscripts_
 _htmlhead_ {
-<html>
+<html_htmlextra_>
 <head>
 <title>_pagetitle_</title>
@@ -62,5 +61,5 @@
 
 <body bgcolor="\#ffffff" text="\#000000" link="\#006666" 
-      alink="\#cc9900" vlink="\#666633" _1_>
+      alink="\#cc9900" vlink="\#666633"_1_>
 }
 
@@ -175,2 +174,8 @@
     \}
 }
+
+
+
+
+
+
Index: /trunk/gsdl/macros/tech.dm
===================================================================
--- /trunk/gsdl/macros/tech.dm	(revision 876)
+++ /trunk/gsdl/macros/tech.dm	(revision 876)
@@ -0,0 +1,99 @@
+package technology
+
+
+#######################################################################
+# java images/scripts
+#######################################################################
+
+# the _javalinks_ macros are the flashy image links at the top right of
+# the page. 
+
+_javalinks_ {_imagehome_}
+_javalinks_ [v=1] {
+_imagehome_<br>
+}
+
+
+#######################################################################
+# icons
+#######################################################################
+
+_iconhtech_ {<img src="_httpiconhtech_" width=_widthhtech_ height=_heighthtech_}
+
+#######################################################################
+# http macros 
+#
+# These contain the url without any quotes
+#######################################################################
+
+_httpiconhtech_ {_httpimg_/h\_tech.gif}
+_widthhtech_ {200}
+_heighthtech_ {57}
+
+
+#######################################################################
+# page content
+#######################################################################
+
+_pagetitle_ {_textpagetitle_}
+
+_imagethispage_ {_iconhtech_}
+
+_content_ {
+_iconblankbar_
+<p>There are several freely available technologies underlying the New Zealand
+Digital Library:
+<ul>
+<li><a href="_httppagex_(gsdlsoft)"><i>Greenstone</i></a>, the digital
+library system that generates each and every page of this website.<p>
+
+<li><a href="_httppagex_(prescript)"><i>PreScript</i></a>, a system
+that converts PostScript to plain ASCII or HTML, detects paragraph boundaries,
+removes hyphenation, and interprets many ligatures.<p>
+
+<li><a href="_httppagex_(mg)"><i>MG</i></a>, an enhancement of the <a
+href="http://www.cs.mu.oz.au/mg"><i>Managing Gigabytes</i></a> full-text
+retrieval system, that provides flexible stemming methods, weighting terms,
+term frequencies, merged indexes, machine independent indexes, and a port to
+MSDOS.<p>
+
+<li><a href="http://www.cs.waikato.ac.nz/sequitur"><i>Sequitur</i></a>, a
+method for inferring compositional hierarchies from strings by detecting
+repetition and factoring it out of the string by  forming rules in a
+grammar. The rules can be composed of non-terminals, giving rise to a
+hierarchy. Sequitur is useful for  recognizing lexical structure in strings,
+and excels at very long sequences.<p>
+
+<li><a href="http://www.nzdl.org/Kea"><i>Kea</i></a>, a program for
+automatically extracting keyphrases from the full text of documents. Candidate
+keyphrases are identified using rudimentary lexical processing, features are
+computed for each candidate, and machine learning is used to generate a
+classifier that determines which candidates should be assigned as
+keyphrases. <p>
+
+<li><a href="http://www.cs.waikato.ac.nz/~stevej/Research/Phrasier/"><i>Phrasier</i></a>, a 
+tool to support information seeking activities in a digital library.  Its novel design 
+reflects the fact that reading, writing, browsing and searching activities are rarely 
+carried out independently of each other.  They overlap and interleave in ways which have 
+not been effectively supported by conventional information retrieval interfaces.  Consequenly
+Phrasier blurs the distinction between writing a document and finding material related to it; 
+between reading a document and finding others on the same or similar topics; between keyword 
+searching and subject browsing. <p>
+
+</ul>
+
+<br>
+}
+
+
+
+###############################################################################
+# English Language Text Macros
+###############################################################################
+
+#moved to english.dm
+
+
+
+
+
Index: /trunk/gsdl/macros/users.dm
===================================================================
--- /trunk/gsdl/macros/users.dm	(revision 875)
+++ /trunk/gsdl/macros/users.dm	(revision 876)
@@ -59,5 +59,5 @@
 
 <form name="edituser" method="post" action="_gwcgi_">
-<input type=hidden name="e" value="_compressedoptions_">
+<input type=hidden name="e" value="_decodedcompressedoptions_">
 <input type=hidden name="a" value="um">
 <input type=hidden name="uma" value="_cgiarguma_">
@@ -117,5 +117,5 @@
 <tr><td>
 <form name="deleteuser" method="post" action="_gwcgi_">
-<input type=hidden name="e" value="_compressedoptions_">
+<input type=hidden name="e" value="_decodedcompressedoptions_">
 <input type=hidden name="a" value="um">
 <input type=hidden name="uma" value="_cgiarguma_">
@@ -150,5 +150,5 @@
 <p>
 <form name="changepasswd" method="post" action="_gwcgi_">
-<input type=hidden name="e" value="_compressedoptions_">
+<input type=hidden name="e" value="_decodedcompressedoptions_">
 <input type=hidden name="a" value="um">
 <input type=hidden name="uma" value="_cgiarguma_">
Index: unk/gsdl/macros/zhbase.dm
===================================================================
--- /trunk/gsdl/macros/zhbase.dm	(revision 875)
+++ 	(revision )
@@ -1,88 +1,0 @@
-package Global
-
-_httpiconchelpof_[l=zh] {_httpimg_/zhchelpof.gif}
-_httpiconchelpon_[l=zh] {_httpimg_/zhchelpon.gif}
-_widthchelpx_[l=zh] {41}
-_heightchelpx_[l=zh] {20}
-
-_httpiconchomeof_[l=zh] {_httpimg_/zhchomeof.gif}
-_httpiconchomeon_[l=zh] {_httpimg_/zhchomeon.gif}
-_widthchomex_[l=zh] {41}
-_heightchomex_[l=zh] {20}
-
-_httpiconcontoff_[l=zh] {_httpimg_/zhcontoff.gif}
-_httpiconconton_[l=zh] {_httpimg_/zhconton.gif}
-_widthcontx_[l=zh] {76}
-_heightcontx_[l=zh] {17}
-
-_httpiconcprefof_[l=zh] {_httpimg_/zhcprefof.gif}
-_httpiconcprefon_[l=zh] {_httpimg_/zhcprefon.gif}
-_widthcprefx_[l=zh] {41}
-_heightcprefx_[l=zh] {20}
-
-_httpiconhauth_[l=zh] {_httpimg_/zhh\_auth.gif}
-_httpiconhhelp_[l=zh] {_httpimg_/zhh\_help.gif}
-_widthhauth_[l=zh] {200}
-_heighthauth_[l=zh] {57}
-
-_httpiconhpref_[l=zh] {_httpimg_/zhh\_pref.gif}
-_widthhpref_[l=zh] {200}
-_heighthpref_[l=zh] {57}
-
-_httpiconhsearch_[l=zh] {_httpimg_/zhh\_sear.gif}
-_widthhsearch_[l=zh] {200}
-_heighthsearch_[l=zh] {57}
-
-_httpiconhtitle_[l=zh] {_httpimg_/zhh\_title.gif}
-_widthhtitle_[l=zh] {200}
-_heighthtitle_[l=zh] {57}
-
-_httpiconqryresb_[l=zh] {_httpimg_/zhqryresb.gif}
-_widthqryresb_[l=zh] {537}
-_heightqryresb_[l=zh] {17}
-
-_httpicontauthgr_[l=zh] {_httpimg_/zhtauthgr.gif}
-_httpicontauthof_[l=zh] {_httpimg_/zhtauthof.gif}
-_httpicontauthon_[l=zh] {_httpimg_/zhtauthon.gif}
-_widthtauthx_[l=zh] {110}
-_heighttauthx_[l=zh] {17}
-
-_httpicontsrchgr_[l=zh] {_httpimg_/zhtsrchgr.gif}
-_httpicontsrchof_[l=zh] {_httpimg_/zhtsrchof.gif}
-_httpicontsrchon_[l=zh] {_httpimg_/zhtsrchon.gif}
-_widthtsrchx_[l=zh] {87}
-_heighttsrchx_[l=zh] {17}
-
-_httpiconttitlgr_[l=zh] {_httpimg_/zhttitlgr.gif}
-_httpiconttitlof_[l=zh] {_httpimg_/zhttitlof.gif}
-_httpiconttitlon_[l=zh] {_httpimg_/zhttitlon.gif}
-_widthttitlx_[l=zh] {87}
-_heightttitlx_[l=zh] {17}
-
-
-_iconclosedbook_ [v=1,l=zh]{<small><_font_><b>æåŒè®°åœ: </b></font></small>}
-
-_textimageabout_[l=zh] {äž»é¡µ}
-_textimagehelp_[l=zh]{åž®å©é¡µ}
-_textimagepref_[l=zh]{éé¡¹é¡µ}
-_textimagegreenstone_[l=zh] {ç»¿ç³æ°å­ååŸä¹ŠéŠèœ¯ä»¶}
-
-_textimagesearch_[l=zh]{ç¹å®èåŽæ£çŽ¢}
-_textimagebrowsetitles_[l=zh] {æé¢åçé¿æäŒ¯å­æ¯é¡ºåºæµè§}
-_textimagebrowseauthors_[l=zh]{æäœè
-åå­çé¿æäŒ¯å­æ¯é¡ºåºæµè§ }
-
-_textgotext_[l=zh] {æææ¬æ¹åŒæµè§æ­€é¡µ}
-_textgographics_[l=zh]{æåŸåœ¢æ¹åŒæµè§æ­€é¡µ}
-
-_texticontabsearchgreen_[l=zh]{æ¥è¯¢}
-_texticontabauthorgreen_[l=zh]{äœè
- A-Z}
-_texticontabtitlegreen_[l=zh]{é¢å A-Z}
-_texticontext_[l=zh] {æµè§æç« å
-å®¹}
-
-_texticondetach_[l=zh] {æåŒäžäžªæ°ççªå£æµè§æ­€é¡µ}
-
-_texticonwarning_[l=zh] {<b>è­Šå: </b>}
-_texticoncont_[l=zh] {ç»§ç»­?}
Index: unk/gsdl/macros/zhhelp.dm
===================================================================
--- /trunk/gsdl/macros/zhhelp.dm	(revision 875)
+++ 	(revision )
@@ -1,31 +1,0 @@
-package help
-
-_simplehelp_[l=zh]{
-<p>æäžç§æ¹æ³æ¥æŸæå
-³_collectionname_çä¿¡æ¯:
-<ul>
-  <li>æç¹å®çè¯æ¥è¯¢
-  <li>æé¢åçæŒé³é¡ºåºæµè§
-  <li>æäœè
-åçæŒé³é¡ºåºæµè§
-</ul>
-
-<p>äœ å¯ä»¥éè¿æ¥è¯¢é¡µ<b>æç¹å®çè¯æ¥è¯¢</b>å
-å«è¯¥è¯çè®°åœãæ¥è¯¢é¡µæ¯è¿å
-¥ç³»ç»æ¶çéŠé¡µïŒäœ ä¹å¯ä»¥éè¿æå
-¶ä»é¡µé¢äžæ¹ç<b>æ¥è¯¢</b>æé®è¿å
-¥è¿äžé¡µã
-
-<p>äœ å¯ä»¥éè¿æé¡µé¢äžæ¹ç<b>é¢å a-z </b>æé®<b>æé¢åçæŒé³é¡ºåºæµè§</b>å
-šéšè®°åœã<br>  
-
-<p>äœ å¯ä»¥éè¿æé¡µé¢äžæ¹ç<b>äœè
- a-z </b>æé®<b>æäœè
-åçæŒé³é¡ºåºæµè§</b>å
-šéšè®°åœã<br>
-
-<p>
-_iconexplain_
-}
-
-
Index: unk/gsdl/macros/zhquery.dm
===================================================================
--- /trunk/gsdl/macros/zhquery.dm	(revision 875)
+++ 	(revision )
@@ -1,22 +1,0 @@
-package query
-
-_textfm1_[l=zh] {è¯é¢: }
-_textmt2_[l=zh] {è¶
-è¿}
-_textdmtq3_[l=zh] {å¹é
-æé®çè®°åœ}
-
-_textmatches_[l=zh] {å¹é
- }
-
-_textbeginsearch_[l=zh] {åŒå§æ¥è¯¢}
-_textsome_[l=zh] {éšå}
-_textall_[l=zh] {å
-šéš}
-
-_textsimplesearch_[l=zh] {æ _If_(_hselection_, _hselection_)_If_(_jselection_,_textjselect_)_If_(_nselection_, in _nselection_ language) 
-æ¥è¯¢å
-å« _querytypeselection_ æé®è¯çè®°åœ}
-
-# these can be the same until translation is done
-_textadvancedsearch_[l=zh] {_textsimplesearch_}
