Changeset 1521
- Timestamp:
- 2000-09-08T15:17:08+12:00 (24 years ago)
- Location:
- trunk/niupepa
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/niupepa/etc/collect.cfg
r1026 r1521 35 35 format DocumentHeading "<h3>{If}{[parent(Top):Title],[parent(Top):Title],[Title]}<br>{If}{[parent(Top):Date],[parent(Top):Date],[Date]}" 36 36 37 receptionist /fast-cgi-bin/niupepalibrary?a=p&p=about&c=niupepa&l=mi 37 receptionist /fast-cgi-bin/niupepalibrary?a=p&p=about&c=niupepa&l=mi&nw=u 38 38 39 39 collectionmeta collectionname "Niupepa: Mäori Newspapers" -
trunk/niupepa/macros/npepa.dm
r1488 r1521 48 48 _httpthiscommentary_ [c=niupepa] {} 49 49 _httpiconthispaper_ [c=niupepa] {} 50 _thispapericonwidth_ [c=niupepa] {0}51 _thispapericonheight_ [c=niupepa] {0}52 50 53 51 _httppageabexpl_ [c=niupepa] {_httppagex_(abexpl)} 54 55 56 _01width_ {314}57 _01height_ {126}58 _03width_ {320}59 _03height_ {205}60 _04width_ {322}61 _04height_ {195}62 _05width_ {320}63 _05height_ {210}64 _06awidth_ {320}65 _06aheight_ {80}66 _08width_ {330}67 _08height_ {139}68 _09width_ {330}69 _09height_ {76}70 _10width_ {320}71 _10height_ {43}72 _12width_ {330}73 _12height_ {95}74 _13width_ {310}75 _13height_ {316}76 _14width_ {330}77 _14height_ {81}78 _15width_ {320}79 _15height_ {110}80 _18width_ {310}81 _18height_ {120}82 _19width_ {333}83 _19height_ {230}84 _25width_ {312}85 _25height_ {56}86 _36awidth_ {327}87 _36aheight_ {153}88 _39width_ {320}89 _39height_ {102}90 _40width_ {298}91 _40height_ {153}92 52 93 53 … … 120 80 _iconabstractintro_[c=niupepa,v=1] {_texticonabstractintro_} 121 81 122 _iconthispaper_ [c=niupepa] {<img name="commentary" src="_httpiconthispaper_of.gif" 123 width="_thispapericonwidth_" height="_thispapericonheight_" border="0" alt="_texticoncommentary_">} 82 _iconthispaper_ [c=niupepa] {<img name="commentary" src="_httpiconthispaper_of.gif" border="0" alt="_texticoncommentary_">} 124 83 125 84 # can't use _gsimage_ macro for detach button as we need to include target … … 146 105 147 106 # this occurs when we're at a commentary page - (no alt text, no link) 148 _nolinkthispaper_ [c=niupepa] {<img src="_httpiconthispaper_on.gif" width="_thispapericonwidth_" 149 height="_thispapericonheight_" border="0">} 107 _nolinkthispaper_ [c=niupepa] {<img src="_httpiconthispaper_on.gif" border="0">} 150 108 151 109 -
trunk/niupepa/src/recpt/Makefile.in
r1077 r1521 31 31 AR = ar 32 32 CC = @CC@ 33 CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual33 CCFLAGS = @CFLAGS@ 34 34 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@ 35 35 … … 142 142 $(MAINCOLSERVRDIR)/browsefilter.o \ 143 143 $(MAINCOLSERVRDIR)/queryfilter.o \ 144 $(MAINCOLSERVRDIR)/mgqueryfilter.o \ 144 145 $(MAINCOLSERVRDIR)/phrasequeryfilter.o \ 145 146 $(MAINCOLSERVRDIR)/phrasesearch.o \ 146 147 $(MAINCOLSERVRDIR)/mggdbmsource.o \ 148 $(MAINCOLSERVRDIR)/search.o \ 147 149 $(MAINCOLSERVRDIR)/mgsearch.o \ 148 150 $(GD)/lib/gsdllib.a \ 149 151 $(GD)/packages/mg/src/text/libtextin.a \ 150 $(GD)/packages/mg/lib/libmg.a 152 $(GD)/packages/mg/lib/libmg.a \ 153 $(GD)/src/mgpp/text/libtextin.a \ 154 $(GD)/src/mgpp/lib/libmg.a 151 155 152 156 ifneq ($(USE_FASTCGI), 1) -
trunk/niupepa/src/recpt/niupepadocaction.cpp
r1023 r1521 28 28 /* 29 29 $Log$ 30 Revision 1.1 2000/03/08 20:44:50 sjboddie 31 Initial revision 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:50 sjboddie 34 added niupepa to CVS 32 35 33 36 Revision 1.2 1999/09/07 22:19:50 sjboddie … … 122 125 // _httpiconthispaper_ the http address of the cover image 123 126 124 // _thispapericonwidth_ the width and height of the cover image125 // _thispapericonheight_126 127 128 127 documentaction::define_internal_macros (disp, args, protos, logout); 129 128 … … 151 150 // _httpiconthispaper_ 152 151 disp.setmacro ("httpiconthispaper", "document", "_httpcollimg_/" + series + "/cover"); 153 154 // _thispapericonwidth_ and _thispapericonheight_155 disp.setmacro ("thispapericonwidth", "document", "_" + series + "width_");156 disp.setmacro ("thispapericonheight", "document", "_" + series + "height_");157 152 } 158 153 } -
trunk/niupepa/src/recpt/niupepahlistbrowserclass.cpp
r1045 r1521 28 28 /* 29 29 $Log$ 30 Revision 1.3 2000/09/08 03:17:08 nzdl 31 updated niupepa collection 32 30 33 Revision 1.2 2000/03/22 02:00:13 nzdl 31 34 updated niupepa collection … … 52 55 // should probably do this in a more general way some time 53 56 int niupepahlistbrowserclass::output_section_group (ResultDocInfo_t §ion, cgiargsclass &args, 54 const text_t & /*collection*/, int colnumber,57 const text_t &collection, int colnumber, 55 58 format_t *formatlistptr, bool use_table, 56 59 text_tset &metadata, bool &getParents, … … 93 96 bool highlight = false; 94 97 textout << "<td"; 95 if ( scount != 3 && scount != 5 && scount != 6 &&96 scount != 7 && scount != 8 && scount != 9 &&97 scount != 10 && scount != 12 && scount != 13) 98 if (!((scount >= 3 && scount <= 8) || (scount >= 10 && scount <= 18) || 99 (scount >= 22 && scount <= 26) || (scount >= 28 && scount <= 29))) { 100 // xxxx-xxxx year ranges require colspan=2 98 101 textout << " colspan=2"; 102 } 99 103 textout << ">"; 100 104 … … 113 117 114 118 textout << outconvert << disp 115 << get_formatted_string (*tsibling, formatlistptr, link, icon, highlight); 119 << get_formatted_string (collection, collectproto, *tsibling, formatlistptr, 120 link, icon, highlight, logout); 116 121 117 122 textout << "</td>\n"; 118 if (scount == 10 || scount == 18) 123 // if (scount == 10 || scount == 18) 124 if (scount == 12 || scount == 24 || scount == 34) 119 125 textout << "</tr><tr>\n"; 120 126 -
trunk/niupepa/src/recpt/niupepalibrarymain.cpp
r1023 r1521 28 28 /* 29 29 $Log$ 30 Revision 1.1 2000/03/08 20:44:49 sjboddie 31 Initial revision 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 32 35 33 36 Revision 1.2 1999/09/07 22:19:50 sjboddie … … 45 48 #include "filter.h" 46 49 #include "browsefilter.h" 47 #include " queryfilter.h"50 #include "mgqueryfilter.h" 48 51 #include "infodbclass.h" 49 52 #include "mgsearch.h" … … 60 63 #include "authenaction.h" 61 64 #include "usersaction.h" 62 #include " authenaction.h"65 #include "delhistoryaction.h" 63 66 64 67 #include "browserclass.h" … … 90 93 while (thiscol != endcol) { 91 94 92 // this memory is created but never destroyed93 // we're also not doing any error checking to make sure we didn't94 // run out of memory95 95 collectserver *cserver = new collectserver(); 96 96 gdbmclass *gdbmhandler = new gdbmclass(); … … 107 107 108 108 // add a query filter 109 queryfilterclass *queryfilter = newqueryfilterclass();109 mgqueryfilterclass *queryfilter = new mgqueryfilterclass(); 110 110 queryfilter->set_gdbmptr (gdbmhandler); 111 111 queryfilter->set_mgsearchptr (mgsearch); … … 121 121 // collection name 122 122 cserver->configure ("collection", *thiscol); 123 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 124 131 nproto.add_collectserver (cserver); 125 132 thiscol ++; … … 134 141 recpt.add_converter ("u", &utf8inconvert, &utf8outconvert); 135 142 136 if (!gsdlhome.empty()) { 137 mapinconvertclass gbinconvert; 138 gbinconvert.setmapfile (gsdlhome, "gbku", 0x25a1); 139 mapoutconvertclass gboutconvert; 140 gboutconvert.setmapfile (gsdlhome, "ugbk", 0xa1f5); 141 recpt.add_converter ("g", &gbinconvert, &gboutconvert); 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); 143 156 144 157 // the list of actions. Note: these actions will become invalid … … 149 162 150 163 pageaction apageaction; 164 apageaction.set_receptionist (&recpt); 151 165 recpt.add_action (&apageaction); 152 166 … … 155 169 156 170 queryaction aqueryaction; 171 aqueryaction.set_receptionist (&recpt); 157 172 recpt.add_action (&aqueryaction); 158 173 159 174 niupepadocaction adocumentaction; 175 adocumentaction.set_receptionist (&recpt); 160 176 recpt.add_action (&adocumentaction); 161 177 … … 166 182 aauthenaction.set_receptionist(&recpt); 167 183 recpt.add_action (&aauthenaction); 184 185 delhistoryaction adelhistoryaction; 186 recpt.add_action(&adelhistoryaction); 187 168 188 169 189 // list of browsers
Note:
See TracChangeset
for help on using the changeset viewer.