Changeset 1945 for trunk/niupepa


Ignore:
Timestamp:
2001-02-12T11:55:37+13:00 (23 years ago)
Author:
nzdl
Message:

updated niupepa collection

Location:
trunk/niupepa
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/niupepa/macros/about.dm

    r1488 r1945  
    1212_imagemined_ [c=niupepa] {<a href="http://www.minedu.govt.nz/">_iconmined_</a>}
    1313
    14 _iconmined_ [c=niupepa] {<img src="_httpcollection_/images/mined.gif" border=0>}
     14_iconmined_ [c=niupepa] {<img src="_httpprefix_/collect/niupepa/images/mined.gif" border=0>}
    1515
    1616#######################################################################
    … …  
    2626
    2727_textabout_ [c=niupepa] {
    28 <h3>_textabcol_</h3>
    2928<p>This is a small but growing collection based on "Niupepa 1842-1933", a microfiche collection
    3029produced by the Alexander Turnbull Library. Niupepa are periodicals published in Maori or
    … …  
    5958Digital image capture carried out by New Zealand Micrographic Services Ltd.
    6059<p>
    61 OCR work sponsored by:<br>
    62 _imagemined_
    63 <p>
    6460}
    6561
    … …  
    7773
    7874_textabout_ [c=niupepa,l=mi] {
    79 <h3>_textabcol_</h3>
    8075<p>E puaki ana _emn_nei pukapuka i te kohinga "Niupepa 1842-1933". Ko taua kohinga he
    8176mea whakaemia e te Alexander Turnball Library ki runga i te kiriata mororiki.
    … …  
    1029704 474 6063 (fax)<br>
    10398<a href="mailto:[email protected]">[email protected]</a>
    104 <p>
    105 ko ng_amn_ mahi OCR ka tautokohia e:<br>
    106 _imagemined_
    107 <p>
    10899}
    109100
    … …  
    115106
    116107_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>)
    118110
     111_textprogress_
    119112
    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>
    127115}
    128116
    … …  
    139127<p>
    140128_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>
    142135}
     136
     137_textprogress_ [c=niupepa] {<p>This collection is a work in progress. <a
     138href="http://nzdl2.cs.waikato.ac.nz/niupepa/npepa_status.html">Click
     139here</a> for details.}
     140
     141_textprogress_ [c=niupepa,l=mi] {<p>Kei te mahi tonu te <a
     142href="http://nzdl2.cs.waikato.ac.nz/niupepa/npepa_status.html">whakarite
     143kupu</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
     149enabled 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>
     158Te T_amn_huhu o Te M_amn_tauranga i homai
     159p_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  
    1111_missingtext_ [c=niupepa] {Text has yet to be digitised for this page}
    1212
    13 _iconclosedbook_ [c=niupepa] {<img src="_httpcollection_/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_">}
    1414_texticonclosedbook_ [c=niupepa] {view niupepa}
    1515_texticonclosedbook_ [c=niupepa,l=mi] {tirohia niupepa}
    … …  
    5555_iconabstract_ [c=niupepa,v=1] {_texticonabstract_}
    5656
    57 _iconcommentary_ [c=niupepa] {<img src="_httpcollection_/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_">}
    5858_iconcommentary_ [c=niupepa,v=1] {_texticoncommentary_}
    5959
    … …  
    108108
    109109
    110 _httpiconefiof_ [c=niupepa] {_httpcollection_/images/efiof.gif}
    111 _httpiconefiof_ [c=niupepa,l=mi] {_httpcollection_/images/mi/efiof.gif}
    112 _httpiconefion_ [c=niupepa] {_httpcollection_/images/efion.gif}
    113 _httpiconefion_ [c=niupepa,l=mi] {_httpcollection_/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}
    114114_widthefix_ [c=niupepa] {65}
    115115_widthefix_ [c=niupepa,l=mi] {65}
    116116_heightefix_ [c=niupepa] {30}
    117117
    118 _httpiconepiof_ [c=niupepa] {_httpcollection_/images/epiof.gif}
    119 _httpiconepiof_ [c=niupepa,l=mi] {_httpcollection_/images/mi/epiof.gif}
    120 _httpiconepion_ [c=niupepa] {_httpcollection_/images/epion.gif}
    121 _httpiconepion_ [c=niupepa,l=mi] {_httpcollection_/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}
    122122_widthepix_ [c=niupepa] {65}
    123123_widthepix_ [c=niupepa,l=mi] {65}
    124124_heightepix_ [c=niupepa] {30}
    125125
    126 _httpiconetextof_ [c=niupepa] {_httpcollection_/images/etextof.gif}
    127 _httpiconetextof_ [c=niupepa,l=mi] {_httpcollection_/images/mi/etextof.gif}
    128 _httpiconetexton_ [c=niupepa] {_httpcollection_/images/etexton.gif}
    129 _httpiconetexton_ [c=niupepa,l=mi] {_httpcollection_/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}
    130130_widthetextx_ [c=niupepa,l=mi] {65}
    131131_widthetextx_ [c=niupepa] {65}
    132132_heightetextx_ [c=niupepa] {30}
    133133
    134 _httpiconeabstrof_ [c=niupepa] {_httpcollection_/images/eabstrof.gif}
    135 _httpiconeabstrof_ [c=niupepa,l=mi] {_httpcollection_/images/mi/eabstrof.gif}
    136 _httpiconeabstron_ [c=niupepa] {_httpcollection_/images/eabstron.gif}
    137 _httpiconeabstron_ [c=niupepa,l=mi] {_httpcollection_/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}
    138138_widtheabstrx_ [c=niupepa] {65}
    139139_widtheabstrx_ [c=niupepa,l=mi] {65}
    140140_heighteabstrx_ [c=niupepa] {30}
    141141
    142 _httpiconenpepaof_ [c=niupepa] {_httpcollection_/images/enpepaof.gif}
    143 _httpiconenpepaof_ [c=niupepa,l=mi] {_httpcollection_/images/mi/enpepaof.gif}
    144 _httpiconenpepaon_ [c=niupepa] {_httpcollection_/images/enpepaon.gif}
    145 _httpiconenpepaon_ [c=niupepa,l=mi] {_httpcollection_/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}
    146146_widthenpepax_ [c=niupepa] {65}
    147147_widthenpepax_ [c=niupepa,l=mi] {65}
    148148_heightenpepax_ [c=niupepa] {30}
    149149
    150 _httpiconeintroof_ [c=niupepa] {_httpcollection_/images/eintroof.gif}
    151 _httpiconeintroof_ [c=niupepa,l=mi] {_httpcollection_/images/mi/eintroof.gif}
    152 _httpiconeintroon_ [c=niupepa] {_httpcollection_/images/eintroon.gif}
    153 _httpiconeintroon_ [c=niupepa,l=mi] {_httpcollection_/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}
    154154_widtheintrox_ [c=niupepa] {65}
    155155_widtheintrox_ [c=niupepa,l=mi] {65}
    156156_heighteintrox_ [c=niupepa] {30}
    157157
    158 _httpiconiabstr_ [c=niupepa] {_httpcollection_/images/iabstr.gif}
     158_httpiconiabstr_ [c=niupepa] {_httpprefix_/collect/niupepa/images/iabstr.gif}
    159159
    160160_texticonsmalltext_ [c=niupepa] {_texticoncommentary_}
    … …  
    298298_iconexplain_ [c=niupepa] {
    299299<table cellspacing="0" cellpadding="2" border="0">
    300 <tr valign="top"><td><img src="_httpcollection_/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>
    301301<td>Click on a newspaper icon to read the corresponding niupepa issue</td></tr>
    302302<tr valign="top"><td><img src="_httpimg_/bshelf.gif" border="0" width=20 height=16></td>
    … …  
    310310_iconexplain_ [c=niupepa,l=mi] {
    311311<table cellspacing="0" cellpadding="2" border="0">
    312 <tr valign="top"><td><img src="_httpcollection_/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>
    313313<td>P_amn_whiritia te p_amn_tene niupepa kia puta mai ai taua niupepa</td></tr>
    314314<tr valign="top"><td><img src="_httpimg_/bshelf.gif" border="0" width=20 height=16></td>

  • trunk/niupepa/src/recpt/niupepadocaction.cpp

    r1556 r1945  
    2222 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    2323 *
    24  * $Id$
    2524 *
    2625 *********************************************************************/
    27 
    28 /*
    29    $Log$
    30    Revision 1.3  2000/09/20 05:18:31  nzdl
    31    *** empty log message ***
    32 
    33    Revision 1.2  2000/09/08 03:17:08  nzdl
    34    updated niupepa collection
    35 
    36    Revision 1.1.1.1  2000/03/08 20:44:50  sjboddie
    37    added niupepa to CVS
    38 
    39    Revision 1.2  1999/09/07 22:19:50  sjboddie
    40    added GPL header
    41 
    42    Revision 1.1  1999/08/29 23:35:07  sjboddie
    43    niupepa receptionist
    44 
    45  */
    46 
    4726
    4827#include <string.h>
    … …  
    158137    }
    159138    // _httpiconthispaper_
    160     disp.setmacro ("httpiconthispaper", "document", "_httpcollimg_/" + series + "/cover");
     139    disp.setmacro ("httpiconthispaper", "document", "_httpprefix_/collect/niupepa/index/assoc/" + series + "/cover");
    161140
    162141    // _headerextra_, _toplink_, _endtoplink_
    … …  
    200179    if (response.docInfo[0].metadata["hasimg"].values[0] == "1") {
    201180      textout << outconvert << disp
    202           << "<p><img src=\"_httpcollimg_/_thisOID_/"
     181          << "<p><img src=\"_httpprefix_/collect/niupepa/index/assoc/_thisOID_/"
    203182          << response.docInfo[0].metadata["Source"].values[0] << ".gif\">\n";
    204183    } else {
    … …  
    217196      textout << outconvert << disp
    218197          << "<center>\n"
    219           << "<p><img src=\"_httpcollimg_/_thisOID_/"
     198          << "<p><img src=\"_httpprefix_/collect/niupepa/index/assoc/_thisOID_/"
    220199          << response.docInfo[0].metadata["Source"].values[0] << "_p.gif\">\n"
    221200          << "</center>\n";

  • trunk/niupepa/src/recpt/niupepahlistbrowserclass.cpp

    r1521 r1945  
    2828/*
    2929   $Log$
     30   Revision 1.4  2001/02/11 22:55:37  nzdl
     31   updated niupepa collection
     32
    3033   Revision 1.3  2000/09/08 03:17:08  nzdl
    3134   updated niupepa collection
    … …  
    9699    bool highlight = false;
    97100    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
    100108      // xxxx-xxxx year ranges require colspan=2
    101109      textout << " colspan=2";
    … …  
    117125
    118126    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);
    121129
    122130    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)
    125132      textout << "</tr><tr>\n";
    126133

  • trunk/niupepa/src/recpt/niupepalibrarymain.cpp

    r1521 r1945  
    2222 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    2323 *
    24  * $Id$
    2524 *
    2625 *********************************************************************/
    2726
    28 /*
    29    $Log$
    30    Revision 1.2  2000/09/08 03:17:08  nzdl
    31    updated niupepa collection
    32 
    33    Revision 1.1.1.1  2000/03/08 20:44:49  sjboddie
    34    added niupepa to CVS
    35 
    36    Revision 1.2  1999/09/07 22:19:50  sjboddie
    37    added GPL header
    38 
    39    Revision 1.1  1999/08/29 23:35:08  sjboddie
    40    niupepa receptionist
    41 
    42  */
    43 
    4427#include "receptionist.h"
     28#include "collectset.h"
    4529#include "cgiwrapper.h"
    4630#include "nullproto.h"
    … …  
    6347#include "authenaction.h"
    6448#include "usersaction.h"
    65 #include "delhistoryaction.h"
    6649
    6750#include "browserclass.h"
    … …  
    7861  receptionist recpt;
    7962  nullproto nproto;
    80  
    81   // add a collection server
    82   text_tarray collections;
    83   collections.push_back ("niupepa");
    8463
     64  text_t gsdlhome, httpdomain, httpprefix;
    8565  // get gsdlhome (if we fail the error will be picked up later -- in
    8666  // 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);
    8970
    90   text_tarray::const_iterator thiscol = collections.begin();
    91   text_tarray::const_iterator endcol = collections.end();
     71  nproto.set_collectset(cservers);
    9272
    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); 
    13475 
    13576  // add the protocol to the receptionist
    13677  recpt.add_protocol (&nproto);
    137 
    138   // add other converters
    139   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); 
    15678
    15779  // the list of actions. Note: these actions will become invalid
    … …  
    183105  recpt.add_action (&aauthenaction);
    184106
    185   delhistoryaction adelhistoryaction;
    186   recpt.add_action(&adelhistoryaction);
    187 
    188107
    189108  // list of browsers
Note: See TracChangeset for help on using the changeset viewer.