Changeset 1521 for trunk/niupepa

Timestamp:

2000-09-08T15:17:08+12:00 (24 years ago)

Author:

nzdl

Message:

updated niupepa collection

Location:

trunk/niupepa

Files:

• etc/collect.cfg (modified) (1 diff)
• macros/npepa.dm (modified) (3 diffs)
• src/recpt/Makefile.in (modified) (2 diffs)
• src/recpt/niupepadocaction.cpp (modified) (3 diffs)
• src/recpt/niupepahlistbrowserclass.cpp (modified) (4 diffs)
• src/recpt/niupepalibrarymain.cpp (modified) (10 diffs)

trunk/niupepa/etc/collect.cfg

@@ -35 +35 @@
 format                 DocumentHeading "<h3>{If}{[parent(Top):Title],[parent(Top):Title],[Title]}<br>{If}{[parent(Top):Date],[parent(Top):Date],[Date]}"
 
-receptionist           /fast-cgi-bin/niupepalibrary?a=p&p=about&c=niupepa&l=mi
+receptionist           /fast-cgi-bin/niupepalibrary?a=p&p=about&c=niupepa&l=mi&nw=u
 
 collectionmeta         collectionname      "Niupepa: M&auml;ori Newspapers"

trunk/niupepa/macros/npepa.dm

@@ -48 +48 @@
 _httpthiscommentary_ [c=niupepa] {}
 _httpiconthispaper_ [c=niupepa] {}
-_thispapericonwidth_ [c=niupepa] {0}
-_thispapericonheight_ [c=niupepa] {0}
 
 _httppageabexpl_ [c=niupepa] {_httppagex_(abexpl)}
-
-
-_01width_ {314}
-_01height_ {126}
-_03width_ {320}
-_03height_ {205}
-_04width_ {322}
-_04height_ {195}
-_05width_ {320}
-_05height_ {210}
-_06awidth_ {320}
-_06aheight_ {80}
-_08width_ {330}
-_08height_ {139}
-_09width_ {330}
-_09height_ {76}
-_10width_ {320}
-_10height_ {43}
-_12width_ {330}
-_12height_ {95}
-_13width_ {310}
-_13height_ {316}
-_14width_ {330}
-_14height_ {81}
-_15width_ {320}
-_15height_ {110}
-_18width_ {310}
-_18height_ {120}
-_19width_ {333}
-_19height_ {230}
-_25width_ {312}
-_25height_ {56}
-_36awidth_ {327}
-_36aheight_ {153}
-_39width_ {320}
-_39height_ {102}
-_40width_ {298}
-_40height_ {153}
 
 
@@ -120 +80 @@
 _iconabstractintro_[c=niupepa,v=1] {_texticonabstractintro_}
 
-_iconthispaper_ [c=niupepa] {<img name="commentary" src="_httpiconthispaper_of.gif" 
-width="_thispapericonwidth_" height="_thispapericonheight_" border="0" alt="_texticoncommentary_">}
+_iconthispaper_ [c=niupepa] {<img name="commentary" src="_httpiconthispaper_of.gif" border="0" alt="_texticoncommentary_">}
 
 # can't use _gsimage_ macro for detach button as we need to include target
@@ -146 +105 @@
 
 # this occurs when we're at a commentary page - (no alt text, no link)
-_nolinkthispaper_ [c=niupepa] {<img src="_httpiconthispaper_on.gif" width="_thispapericonwidth_" 
-height="_thispapericonheight_" border="0">}
+_nolinkthispaper_ [c=niupepa] {<img src="_httpiconthispaper_on.gif" border="0">}
 
 

trunk/niupepa/src/recpt/Makefile.in

@@ -31 +31 @@
 AR = ar
 CC = @CC@
-CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual
+CCFLAGS = @CFLAGS@
 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER @DEFS@
 
@@ -142 +142 @@
     $(MAINCOLSERVRDIR)/browsefilter.o \
     $(MAINCOLSERVRDIR)/queryfilter.o \
+    $(MAINCOLSERVRDIR)/mgqueryfilter.o \
     $(MAINCOLSERVRDIR)/phrasequeryfilter.o \
     $(MAINCOLSERVRDIR)/phrasesearch.o \
     $(MAINCOLSERVRDIR)/mggdbmsource.o \
+    $(MAINCOLSERVRDIR)/search.o \
     $(MAINCOLSERVRDIR)/mgsearch.o \
     $(GD)/lib/gsdllib.a  \
     $(GD)/packages/mg/src/text/libtextin.a \
-    $(GD)/packages/mg/lib/libmg.a
+    $(GD)/packages/mg/lib/libmg.a \
+    $(GD)/src/mgpp/text/libtextin.a \
+    $(GD)/src/mgpp/lib/libmg.a
 
 ifneq ($(USE_FASTCGI), 1)

trunk/niupepa/src/recpt/niupepadocaction.cpp

@@ -28 +28 @@
 /*
    $Log$
-   Revision 1.1  2000/03/08 20:44:50  sjboddie
-   Initial revision
+   Revision 1.2  2000/09/08 03:17:08  nzdl
+   updated niupepa collection
+
+   Revision 1.1.1.1  2000/03/08 20:44:50  sjboddie
+   added niupepa to CVS
 
    Revision 1.2  1999/09/07 22:19:50  sjboddie
@@ -122 +125 @@
   // _httpiconthispaper_    the http address of the cover image
   
-  // _thispapericonwidth_   the width and height of the cover image
-  // _thispapericonheight_ 
-
-
   documentaction::define_internal_macros (disp, args, protos, logout);
 
@@ -151 +150 @@
     // _httpiconthispaper_
     disp.setmacro ("httpiconthispaper", "document", "_httpcollimg_/" + series + "/cover");
-
-    // _thispapericonwidth_ and _thispapericonheight_
-    disp.setmacro ("thispapericonwidth", "document", "_" + series + "width_");
-    disp.setmacro ("thispapericonheight", "document", "_" + series + "height_");
   }
 }

trunk/niupepa/src/recpt/niupepahlistbrowserclass.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.3  2000/09/08 03:17:08  nzdl
+   updated niupepa collection
+
    Revision 1.2  2000/03/22 02:00:13  nzdl
    updated niupepa collection
@@ -52 +55 @@
 // should probably do this in a more general way some time
 int niupepahlistbrowserclass::output_section_group (ResultDocInfo_t &section, cgiargsclass &args,
-                            const text_t &/*collection*/, int colnumber, 
+                            const text_t &collection, int colnumber, 
                             format_t *formatlistptr, bool use_table, 
                             text_tset &metadata, bool &getParents, 
@@ -93 +96 @@
     bool highlight = false;
     textout << "<td";
-    if (scount != 3 && scount != 5 && scount != 6 &&
-    scount != 7 && scount != 8 && scount != 9 &&
-    scount != 10 && scount != 12 && scount != 13)
+    if (!((scount >= 3 && scount <= 8) || (scount >= 10 && scount <= 18) ||
+    (scount >= 22 && scount <= 26) || (scount >= 28 && scount <= 29))) {
+      // xxxx-xxxx year ranges require colspan=2
       textout << " colspan=2";
+    }
     textout << ">";
 
@@ -113 +117 @@
 
     textout << outconvert << disp 
-        << get_formatted_string (*tsibling, formatlistptr, link, icon, highlight);
+        << get_formatted_string (collection, collectproto, *tsibling, formatlistptr, 
+                     link, icon, highlight, logout);
 
     textout << "</td>\n";
-    if (scount == 10 || scount == 18)
+    //    if (scount == 10 || scount == 18)
+    if (scount == 12 || scount == 24 || scount == 34)
       textout << "</tr><tr>\n";
 

trunk/niupepa/src/recpt/niupepalibrarymain.cpp

@@ -28 +28 @@
 /*
    $Log$
-   Revision 1.1  2000/03/08 20:44:49  sjboddie
-   Initial revision
+   Revision 1.2  2000/09/08 03:17:08  nzdl
+   updated niupepa collection
+
+   Revision 1.1.1.1  2000/03/08 20:44:49  sjboddie
+   added niupepa to CVS
 
    Revision 1.2  1999/09/07 22:19:50  sjboddie
@@ -45 +48 @@
 #include "filter.h"
 #include "browsefilter.h"
-#include "queryfilter.h"
+#include "mgqueryfilter.h"
 #include "infodbclass.h"
 #include "mgsearch.h"
@@ -60 +63 @@
 #include "authenaction.h"
 #include "usersaction.h"
-#include "authenaction.h"
+#include "delhistoryaction.h"
 
 #include "browserclass.h"
@@ -90 +93 @@
   while (thiscol != endcol) {
 
-    // this memory is created but never destroyed
-    // we're also not doing any error checking to make sure we didn't
-    // run out of memory
     collectserver *cserver = new collectserver();
     gdbmclass *gdbmhandler = new gdbmclass();
@@ -107 +107 @@
     
     // add a query filter
-    queryfilterclass *queryfilter = new queryfilterclass();
+    mgqueryfilterclass *queryfilter = new mgqueryfilterclass();
     queryfilter->set_gdbmptr (gdbmhandler);
     queryfilter->set_mgsearchptr (mgsearch);
@@ -121 +121 @@
     // collection name
     cserver->configure ("collection", *thiscol);
-    
+
+    // configure receptionist's collectinfo structure 
+    text_tarray colinfo;
+    colinfo.push_back (*thiscol);
+    colinfo.push_back (gsdlhome);
+    colinfo.push_back (gsdlhome);
+    recpt.configure ("collectinfo", colinfo);
+      
     nproto.add_collectserver (cserver);
     thiscol ++;
@@ -134 +141 @@
   recpt.add_converter ("u", &utf8inconvert, &utf8outconvert);
 
-  if (!gsdlhome.empty()) {
-    mapinconvertclass gbinconvert;
-    gbinconvert.setmapfile (gsdlhome, "gbku", 0x25a1);
-    mapoutconvertclass gboutconvert;
-    gboutconvert.setmapfile (gsdlhome, "ugbk", 0xa1f5);
-    recpt.add_converter ("g", &gbinconvert, &gboutconvert);
-  }
+  mapinconvertclass gbinconvert;
+  gbinconvert.setmapfile (gsdlhome, "gbku", 0x25a1);
+  mapoutconvertclass gboutconvert;
+  gboutconvert.setmapfile (gsdlhome, "ugbk", 0xa1f5);
+  recpt.add_converter ("g", &gbinconvert, &gboutconvert);
+
+  text_t armapfile = filename_cat (gsdlhome, "unicode", "MAPPINGS");
+  armapfile = filename_cat (armapfile, "WINDOWS", "1256.TXT");
+  simplemapinconvertclass arinconvert;
+  arinconvert.setmapfile (armapfile);
+  simplemapoutconvertclass aroutconvert;
+  aroutconvert.setmapfile (armapfile);
+  recpt.add_converter ("a", &arinconvert, &aroutconvert);  
 
   // the list of actions. Note: these actions will become invalid
@@ -149 +162 @@
 
   pageaction apageaction;
+  apageaction.set_receptionist (&recpt);
   recpt.add_action (&apageaction);
 
@@ -155 +169 @@
 
   queryaction aqueryaction;
+  aqueryaction.set_receptionist (&recpt);
   recpt.add_action (&aqueryaction);
 
   niupepadocaction adocumentaction;
+  adocumentaction.set_receptionist (&recpt);
   recpt.add_action (&adocumentaction);
 
@@ -166 +182 @@
   aauthenaction.set_receptionist(&recpt);
   recpt.add_action (&aauthenaction);
+
+  delhistoryaction adelhistoryaction;
+  recpt.add_action(&adelhistoryaction);
+
 
   // list of browsers