Changeset 1945 for trunk/niupepa
- Timestamp:
- 2001-02-12T11:55:37+13:00 (23 years ago)
- Location:
- trunk/niupepa
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/niupepa/macros/about.dm
r1488 r1945 12 12 _imagemined_ [c=niupepa] {<a href="http://www.minedu.govt.nz/">_iconmined_</a>} 13 13 14 _iconmined_ [c=niupepa] {<img src="_http collection_/images/mined.gif" border=0>}14 _iconmined_ [c=niupepa] {<img src="_httpprefix_/collect/niupepa/images/mined.gif" border=0>} 15 15 16 16 ####################################################################### … … 26 26 27 27 _textabout_ [c=niupepa] { 28 <h3>_textabcol_</h3>29 28 <p>This is a small but growing collection based on "Niupepa 1842-1933", a microfiche collection 30 29 produced by the Alexander Turnbull Library. Niupepa are periodicals published in Maori or … … 59 58 Digital image capture carried out by New Zealand Micrographic Services Ltd. 60 59 <p> 61 OCR work sponsored by:<br>62 _imagemined_63 <p>64 60 } 65 61 … … 77 73 78 74 _textabout_ [c=niupepa,l=mi] { 79 <h3>_textabcol_</h3>80 75 <p>E puaki ana _emn_nei pukapuka i te kohinga "Niupepa 1842-1933". Ko taua kohinga he 81 76 mea whakaemia e te Alexander Turnball Library ki runga i te kiriata mororiki. … … 102 97 04 474 6063 (fax)<br> 103 98 <a href="mailto:[email protected]">[email protected]</a> 104 <p>105 ko ng_amn_ mahi OCR ka tautokohia e:<br>106 _imagemined_107 <p>108 99 } 109 100 … … 115 106 116 107 _aboutextra_ [c=niupepa] { 117 _If_("_cgiargl_" eq "mi",<a href="_httppageabout_&l=en">English language version</a><p>) 108 _If_("_cgiargl_" eq "mi",<a href="_httppageabout_&l=en">English language version</a><p>, 109 <a href="_httppageabout_&l=mi&nw=u">Whakaaturanga Reo M_amn_ori</a><p>) 118 110 111 _textprogress_ 119 112 120 <p>This collection is a work in progess. <a 121 href="http://nzdl2.cs.waikato.ac.nz/niupepa/npepa_status.html">Click 122 here</a> for details. 123 124 125 <h3>_help:textsimplehelpheading_</h3> 126 _help:simplehelp_ 113 <h3><a href="#simplehelp">_help:textsimplehelpheading_</a></h3> 114 <h3><a href="#abcoll">_textabcol_</a></h3> 127 115 } 128 116 … … 139 127 <p> 140 128 _iconblankbar_<br> 141 _textabout_ 129 _textmined_ 130 <p>_iconblankbar_<br> 131 132 <a name="simplehelp">_help:simplehelp_</a> 133 _iconblankbar_<br> 134 <a name="abcoll">_textabout_</a> 142 135 } 136 137 _textprogress_ [c=niupepa] {<p>This collection is a work in progress. <a 138 href="http://nzdl2.cs.waikato.ac.nz/niupepa/npepa_status.html">Click 139 here</a> for details.} 140 141 _textprogress_ [c=niupepa,l=mi] {<p>Kei te mahi tonu te <a 142 href="http://nzdl2.cs.waikato.ac.nz/niupepa/npepa_status.html">whakarite 143 kupu</a> m_omn_ te rapu.} 144 145 _textmined_ [c=niupepa] { 146 <table width=_pagewidth_><tr valign=top> 147 <td>_imagemined_</td> 148 <td>We are indebted to the Ministry of Education who's financial support 149 enabled these pages to be transferred to a web suitable format.</td> 150 </tr> 151 </table> 152 } 153 154 _textmined_ [c=niupepa,l=mi] { 155 <table width=_pagewidth_><tr valign=top> 156 <td>_imagemined_</td> 157 <td>Ka nui te mihi te aroha hoki ki<br> 158 Te T_amn_huhu o Te M_amn_tauranga i homai 159 p_umn_tea hei whakawhiti mai ai ng_amn_ wh_amn_rangi nei ki te ipurangi.</td> 160 </tr> 161 </table> 162 } -
trunk/niupepa/macros/npepa.dm
r1556 r1945 11 11 _missingtext_ [c=niupepa] {Text has yet to be digitised for this page} 12 12 13 _iconclosedbook_ [c=niupepa] {<img src="_http collection_/images/np.gif" valign=top width=20 height=20 border=0 alt="_texticonclosedbook_">}13 _iconclosedbook_ [c=niupepa] {<img src="_httpprefix_/collect/niupepa/images/np.gif" valign=top width=20 height=20 border=0 alt="_texticonclosedbook_">} 14 14 _texticonclosedbook_ [c=niupepa] {view niupepa} 15 15 _texticonclosedbook_ [c=niupepa,l=mi] {tirohia niupepa} … … 55 55 _iconabstract_ [c=niupepa,v=1] {_texticonabstract_} 56 56 57 _iconcommentary_ [c=niupepa] {<img src="_http collection_/images/icomm.gif" valign=top border=0 alt="_texticoncommentary_">}57 _iconcommentary_ [c=niupepa] {<img src="_httpprefix_/collect/niupepa/images/icomm.gif" valign=top border=0 alt="_texticoncommentary_">} 58 58 _iconcommentary_ [c=niupepa,v=1] {_texticoncommentary_} 59 59 … … 108 108 109 109 110 _httpiconefiof_ [c=niupepa] {_http collection_/images/efiof.gif}111 _httpiconefiof_ [c=niupepa,l=mi] {_http collection_/images/mi/efiof.gif}112 _httpiconefion_ [c=niupepa] {_http collection_/images/efion.gif}113 _httpiconefion_ [c=niupepa,l=mi] {_http collection_/images/mi/efion.gif}110 _httpiconefiof_ [c=niupepa] {_httpprefix_/collect/niupepa/images/efiof.gif} 111 _httpiconefiof_ [c=niupepa,l=mi] {_httpprefix_/collect/niupepa/images/mi/efiof.gif} 112 _httpiconefion_ [c=niupepa] {_httpprefix_/collect/niupepa/images/efion.gif} 113 _httpiconefion_ [c=niupepa,l=mi] {_httpprefix_/collect/niupepa/images/mi/efion.gif} 114 114 _widthefix_ [c=niupepa] {65} 115 115 _widthefix_ [c=niupepa,l=mi] {65} 116 116 _heightefix_ [c=niupepa] {30} 117 117 118 _httpiconepiof_ [c=niupepa] {_http collection_/images/epiof.gif}119 _httpiconepiof_ [c=niupepa,l=mi] {_http collection_/images/mi/epiof.gif}120 _httpiconepion_ [c=niupepa] {_http collection_/images/epion.gif}121 _httpiconepion_ [c=niupepa,l=mi] {_http collection_/images/mi/epion.gif}118 _httpiconepiof_ [c=niupepa] {_httpprefix_/collect/niupepa/images/epiof.gif} 119 _httpiconepiof_ [c=niupepa,l=mi] {_httpprefix_/collect/niupepa/images/mi/epiof.gif} 120 _httpiconepion_ [c=niupepa] {_httpprefix_/collect/niupepa/images/epion.gif} 121 _httpiconepion_ [c=niupepa,l=mi] {_httpprefix_/collect/niupepa/images/mi/epion.gif} 122 122 _widthepix_ [c=niupepa] {65} 123 123 _widthepix_ [c=niupepa,l=mi] {65} 124 124 _heightepix_ [c=niupepa] {30} 125 125 126 _httpiconetextof_ [c=niupepa] {_http collection_/images/etextof.gif}127 _httpiconetextof_ [c=niupepa,l=mi] {_http collection_/images/mi/etextof.gif}128 _httpiconetexton_ [c=niupepa] {_http collection_/images/etexton.gif}129 _httpiconetexton_ [c=niupepa,l=mi] {_http collection_/images/mi/etexton.gif}126 _httpiconetextof_ [c=niupepa] {_httpprefix_/collect/niupepa/images/etextof.gif} 127 _httpiconetextof_ [c=niupepa,l=mi] {_httpprefix_/collect/niupepa/images/mi/etextof.gif} 128 _httpiconetexton_ [c=niupepa] {_httpprefix_/collect/niupepa/images/etexton.gif} 129 _httpiconetexton_ [c=niupepa,l=mi] {_httpprefix_/collect/niupepa/images/mi/etexton.gif} 130 130 _widthetextx_ [c=niupepa,l=mi] {65} 131 131 _widthetextx_ [c=niupepa] {65} 132 132 _heightetextx_ [c=niupepa] {30} 133 133 134 _httpiconeabstrof_ [c=niupepa] {_http collection_/images/eabstrof.gif}135 _httpiconeabstrof_ [c=niupepa,l=mi] {_http collection_/images/mi/eabstrof.gif}136 _httpiconeabstron_ [c=niupepa] {_http collection_/images/eabstron.gif}137 _httpiconeabstron_ [c=niupepa,l=mi] {_http collection_/images/mi/eabstron.gif}134 _httpiconeabstrof_ [c=niupepa] {_httpprefix_/collect/niupepa/images/eabstrof.gif} 135 _httpiconeabstrof_ [c=niupepa,l=mi] {_httpprefix_/collect/niupepa/images/mi/eabstrof.gif} 136 _httpiconeabstron_ [c=niupepa] {_httpprefix_/collect/niupepa/images/eabstron.gif} 137 _httpiconeabstron_ [c=niupepa,l=mi] {_httpprefix_/collect/niupepa/images/mi/eabstron.gif} 138 138 _widtheabstrx_ [c=niupepa] {65} 139 139 _widtheabstrx_ [c=niupepa,l=mi] {65} 140 140 _heighteabstrx_ [c=niupepa] {30} 141 141 142 _httpiconenpepaof_ [c=niupepa] {_http collection_/images/enpepaof.gif}143 _httpiconenpepaof_ [c=niupepa,l=mi] {_http collection_/images/mi/enpepaof.gif}144 _httpiconenpepaon_ [c=niupepa] {_http collection_/images/enpepaon.gif}145 _httpiconenpepaon_ [c=niupepa,l=mi] {_http collection_/images/mi/enpepaon.gif}142 _httpiconenpepaof_ [c=niupepa] {_httpprefix_/collect/niupepa/images/enpepaof.gif} 143 _httpiconenpepaof_ [c=niupepa,l=mi] {_httpprefix_/collect/niupepa/images/mi/enpepaof.gif} 144 _httpiconenpepaon_ [c=niupepa] {_httpprefix_/collect/niupepa/images/enpepaon.gif} 145 _httpiconenpepaon_ [c=niupepa,l=mi] {_httpprefix_/collect/niupepa/images/mi/enpepaon.gif} 146 146 _widthenpepax_ [c=niupepa] {65} 147 147 _widthenpepax_ [c=niupepa,l=mi] {65} 148 148 _heightenpepax_ [c=niupepa] {30} 149 149 150 _httpiconeintroof_ [c=niupepa] {_http collection_/images/eintroof.gif}151 _httpiconeintroof_ [c=niupepa,l=mi] {_http collection_/images/mi/eintroof.gif}152 _httpiconeintroon_ [c=niupepa] {_http collection_/images/eintroon.gif}153 _httpiconeintroon_ [c=niupepa,l=mi] {_http collection_/images/mi/eintroon.gif}150 _httpiconeintroof_ [c=niupepa] {_httpprefix_/collect/niupepa/images/eintroof.gif} 151 _httpiconeintroof_ [c=niupepa,l=mi] {_httpprefix_/collect/niupepa/images/mi/eintroof.gif} 152 _httpiconeintroon_ [c=niupepa] {_httpprefix_/collect/niupepa/images/eintroon.gif} 153 _httpiconeintroon_ [c=niupepa,l=mi] {_httpprefix_/collect/niupepa/images/mi/eintroon.gif} 154 154 _widtheintrox_ [c=niupepa] {65} 155 155 _widtheintrox_ [c=niupepa,l=mi] {65} 156 156 _heighteintrox_ [c=niupepa] {30} 157 157 158 _httpiconiabstr_ [c=niupepa] {_http collection_/images/iabstr.gif}158 _httpiconiabstr_ [c=niupepa] {_httpprefix_/collect/niupepa/images/iabstr.gif} 159 159 160 160 _texticonsmalltext_ [c=niupepa] {_texticoncommentary_} … … 298 298 _iconexplain_ [c=niupepa] { 299 299 <table cellspacing="0" cellpadding="2" border="0"> 300 <tr valign="top"><td><img src="_http collection_/images/np.gif" width="20" height="20" border="0"></td>300 <tr valign="top"><td><img src="_httpprefix_/collect/niupepa/images/np.gif" width="20" height="20" border="0"></td> 301 301 <td>Click on a newspaper icon to read the corresponding niupepa issue</td></tr> 302 302 <tr valign="top"><td><img src="_httpimg_/bshelf.gif" border="0" width=20 height=16></td> … … 310 310 _iconexplain_ [c=niupepa,l=mi] { 311 311 <table cellspacing="0" cellpadding="2" border="0"> 312 <tr valign="top"><td><img src="_http collection_/images/np.gif" width="20" height="20" border="0"></td>312 <tr valign="top"><td><img src="_httpprefix_/collect/niupepa/images/np.gif" width="20" height="20" border="0"></td> 313 313 <td>P_amn_whiritia te p_amn_tene niupepa kia puta mai ai taua niupepa</td></tr> 314 314 <tr valign="top"><td><img src="_httpimg_/bshelf.gif" border="0" width=20 height=16></td> -
trunk/niupepa/src/recpt/niupepadocaction.cpp
r1556 r1945 22 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 23 * 24 * $Id$25 24 * 26 25 *********************************************************************/ 27 28 /*29 $Log$30 Revision 1.3 2000/09/20 05:18:31 nzdl31 *** empty log message ***32 33 Revision 1.2 2000/09/08 03:17:08 nzdl34 updated niupepa collection35 36 Revision 1.1.1.1 2000/03/08 20:44:50 sjboddie37 added niupepa to CVS38 39 Revision 1.2 1999/09/07 22:19:50 sjboddie40 added GPL header41 42 Revision 1.1 1999/08/29 23:35:07 sjboddie43 niupepa receptionist44 45 */46 47 26 48 27 #include <string.h> … … 158 137 } 159 138 // _httpiconthispaper_ 160 disp.setmacro ("httpiconthispaper", "document", "_http collimg_/" + series + "/cover");139 disp.setmacro ("httpiconthispaper", "document", "_httpprefix_/collect/niupepa/index/assoc/" + series + "/cover"); 161 140 162 141 // _headerextra_, _toplink_, _endtoplink_ … … 200 179 if (response.docInfo[0].metadata["hasimg"].values[0] == "1") { 201 180 textout << outconvert << disp 202 << "<p><img src=\"_http collimg_/_thisOID_/"181 << "<p><img src=\"_httpprefix_/collect/niupepa/index/assoc/_thisOID_/" 203 182 << response.docInfo[0].metadata["Source"].values[0] << ".gif\">\n"; 204 183 } else { … … 217 196 textout << outconvert << disp 218 197 << "<center>\n" 219 << "<p><img src=\"_http collimg_/_thisOID_/"198 << "<p><img src=\"_httpprefix_/collect/niupepa/index/assoc/_thisOID_/" 220 199 << response.docInfo[0].metadata["Source"].values[0] << "_p.gif\">\n" 221 200 << "</center>\n"; -
trunk/niupepa/src/recpt/niupepahlistbrowserclass.cpp
r1521 r1945 28 28 /* 29 29 $Log$ 30 Revision 1.4 2001/02/11 22:55:37 nzdl 31 updated niupepa collection 32 30 33 Revision 1.3 2000/09/08 03:17:08 nzdl 31 34 updated niupepa collection … … 96 99 bool highlight = false; 97 100 textout << "<td"; 98 if (!((scount >= 3 && scount <= 8) || (scount >= 10 && scount <= 18) || 99 (scount >= 22 && scount <= 26) || (scount >= 28 && scount <= 29))) { 101 // if (!((scount >= 3 && scount <= 8) || (scount >= 10 && scount <= 18) || 102 // (scount >= 22 && scount <= 26) || (scount >= 28 && scount <= 29))) { 103 if (scount == 1 || scount == 2 || scount == 9 || scount == 19 || scount == 20 || scount == 21 || 104 scount == 29 || scount == 30 || scount == 32 || scount == 33 || scount == 34 || scount == 37 || 105 scount == 47 || scount == 48 || scount == 52 || scount == 53 || scount == 54 || scount == 55 || 106 scount == 56 || scount == 57 || scount == 58 || scount == 59 || scount == 60) { 107 100 108 // xxxx-xxxx year ranges require colspan=2 101 109 textout << " colspan=2"; … … 117 125 118 126 textout << outconvert << disp 119 << get_formatted_string (collection, collectproto, *tsibling, formatlistptr,120 link, icon, highlight, logout);127 << get_formatted_string (collection, collectproto, *tsibling, disp, 128 formatlistptr, link, icon, highlight, logout); 121 129 122 130 textout << "</td>\n"; 123 // if (scount == 10 || scount == 18) 124 if (scount == 12 || scount == 24 || scount == 34) 131 if (scount == 12 || scount == 24 || scount == 34 || scount == 47 || scount == 56) 125 132 textout << "</tr><tr>\n"; 126 133 -
trunk/niupepa/src/recpt/niupepalibrarymain.cpp
r1521 r1945 22 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 23 * 24 * $Id$25 24 * 26 25 *********************************************************************/ 27 26 28 /*29 $Log$30 Revision 1.2 2000/09/08 03:17:08 nzdl31 updated niupepa collection32 33 Revision 1.1.1.1 2000/03/08 20:44:49 sjboddie34 added niupepa to CVS35 36 Revision 1.2 1999/09/07 22:19:50 sjboddie37 added GPL header38 39 Revision 1.1 1999/08/29 23:35:08 sjboddie40 niupepa receptionist41 42 */43 44 27 #include "receptionist.h" 28 #include "collectset.h" 45 29 #include "cgiwrapper.h" 46 30 #include "nullproto.h" … … 63 47 #include "authenaction.h" 64 48 #include "usersaction.h" 65 #include "delhistoryaction.h"66 49 67 50 #include "browserclass.h" … … 78 61 receptionist recpt; 79 62 nullproto nproto; 80 81 // add a collection server82 text_tarray collections;83 collections.push_back ("niupepa");84 63 64 text_t gsdlhome, httpdomain, httpprefix; 85 65 // get gsdlhome (if we fail the error will be picked up later -- in 86 66 // cgiwrapper) 87 text_t gsdlhome; 88 site_cfg_read (gsdlhome); 67 site_cfg_read (gsdlhome, httpdomain, httpprefix); 68 collectset *cservers = new collectset(); 69 cservers->add_collection ("niupepa", &recpt, gsdlhome, gsdlhome); 89 70 90 text_tarray::const_iterator thiscol = collections.begin(); 91 text_tarray::const_iterator endcol = collections.end(); 71 nproto.set_collectset(cservers); 92 72 93 while (thiscol != endcol) { 94 95 collectserver *cserver = new collectserver(); 96 gdbmclass *gdbmhandler = new gdbmclass(); 97 mgsearchclass *mgsearch = new mgsearchclass(); 98 99 // add a null filter 100 filterclass *filter = new filterclass (); 101 cserver->add_filter (filter); 102 103 // add a browse filter 104 browsefilterclass *browsefilter = new browsefilterclass(); 105 browsefilter->set_gdbmptr (gdbmhandler); 106 cserver->add_filter (browsefilter); 107 108 // add a query filter 109 mgqueryfilterclass *queryfilter = new mgqueryfilterclass(); 110 queryfilter->set_gdbmptr (gdbmhandler); 111 queryfilter->set_mgsearchptr (mgsearch); 112 cserver->add_filter (queryfilter); 113 114 // add a mg and gdbm source 115 mggdbmsourceclass *mggdbmsource = new mggdbmsourceclass (); 116 mggdbmsource->set_gdbmptr (gdbmhandler); 117 mggdbmsource->set_mgsearchptr (mgsearch); 118 cserver->add_source (mggdbmsource); 119 120 // inform collection server and everything it contains about its 121 // collection name 122 cserver->configure ("collection", *thiscol); 123 124 // configure receptionist's collectinfo structure 125 text_tarray colinfo; 126 colinfo.push_back (*thiscol); 127 colinfo.push_back (gsdlhome); 128 colinfo.push_back (gsdlhome); 129 recpt.configure ("collectinfo", colinfo); 130 131 nproto.add_collectserver (cserver); 132 thiscol ++; 133 } 73 // configure the receptionist server list 74 cservers->setReceptionistServers(recpt, gsdlhome); 134 75 135 76 // add the protocol to the receptionist 136 77 recpt.add_protocol (&nproto); 137 138 // add other converters139 utf8inconvertclass utf8inconvert;140 utf8outconvertclass utf8outconvert;141 recpt.add_converter ("u", &utf8inconvert, &utf8outconvert);142 143 mapinconvertclass gbinconvert;144 gbinconvert.setmapfile (gsdlhome, "gbku", 0x25a1);145 mapoutconvertclass gboutconvert;146 gboutconvert.setmapfile (gsdlhome, "ugbk", 0xa1f5);147 recpt.add_converter ("g", &gbinconvert, &gboutconvert);148 149 text_t armapfile = filename_cat (gsdlhome, "unicode", "MAPPINGS");150 armapfile = filename_cat (armapfile, "WINDOWS", "1256.TXT");151 simplemapinconvertclass arinconvert;152 arinconvert.setmapfile (armapfile);153 simplemapoutconvertclass aroutconvert;154 aroutconvert.setmapfile (armapfile);155 recpt.add_converter ("a", &arinconvert, &aroutconvert);156 78 157 79 // the list of actions. Note: these actions will become invalid … … 183 105 recpt.add_action (&aauthenaction); 184 106 185 delhistoryaction adelhistoryaction;186 recpt.add_action(&adelhistoryaction);187 188 107 189 108 // list of browsers
Note:
See TracChangeset
for help on using the changeset viewer.