Changeset 1556

Timestamp:

2000-09-20T17:18:31+12:00 (24 years ago)

Author:

nzdl

Message:

* empty log message *

Location:

trunk

Files:

• gsdl/macros/english.dm (modified) (1 diff)
• niupepa/etc/collect.cfg (modified) (1 diff)
• niupepa/macros/npepa.dm (modified) (1 diff)
• niupepa/src/recpt/niupepadocaction.cpp (modified) (5 diffs)

trunk/gsdl/macros/english.dm

@@ -110 +110 @@
 _pages_ {pages}
 _of_ { of }
-_vol_ {Volume}
-_num_ {Number}
+_vol_ {Vol.}
+_num_ {No.}
 
 _textmonth00_ {}

trunk/niupepa/etc/collect.cfg

@@ -34 +34 @@
 format                 CL2DateList "<td valign=top>{If}{[abstract],<a href=_httpdocument_&cl=_cgiargcl_&d=[abstract]>_document:iconabstract_}[link][icon][/link]</td><td>[Series]: [Title]</td><td>[Date]</td>"
 
-format                 DocumentHeading "<h3>{If}{[parent(Top):Title],[parent(Top):Title],[Title]}<br>{If}{[parent(Top):Date],[parent(Top):Date],[Date]}"
+format                 DocumentHeading "<h3>_headerextra__toplink_{If}{[parent(Top):Title],[parent(Top):Title],[Title]}<br>{If}{[parent(Top):Date],[parent(Top):Date],[Date]}_endtoplink_"
+
+format DocumentText "<center><table width=_pagewidth_><tr><td>[Text]</td></tr></table></center>"
 
 receptionist           /fast-cgi-bin/niupepalibrary?a=p&p=about&c=niupepa&l=mi&nw=u

trunk/niupepa/macros/npepa.dm

@@ -21 +21 @@
 _commentary_ [c=niupepa,l=mi] {Kupu Whakataki}
 
-_abstract_ [c=niupepa] {Abstract: }
-
-_abstract_ [c=niupepa,l=mi] {R_amn_popoto reo P_amn_keh_amn_: }
+_abstract_ [c=niupepa] {<i>Abstract</i><br>}
+
+_abstract_ [c=niupepa,l=mi] {<i>R_amn_popoto reo P_amn_keh_amn_</i><br>}
 
 #######################################################################

trunk/niupepa/src/recpt/niupepadocaction.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.3  2000/09/20 05:18:31  nzdl
+   *** empty log message ***
+
    Revision 1.2  2000/09/08 03:17:08  nzdl
    updated niupepa collection
@@ -47 +50 @@
 #include "niupepabrowsetools.h"
 #include "OIDtools.h"
+#include "gsdltools.h"
 #include "querytools.h"
 #include "unitool.h"
@@ -124 +128 @@
 
   // _httpiconthispaper_    the http address of the cover image
+
+  // _headerextra_          set to _abstract_ if current document is an abstract
   
+  // _toplink_ _endtoplink_ link to the first page of the current document
+
   documentaction::define_internal_macros (disp, args, protos, logout);
 
@@ -131 +139 @@
   text_tset metadata;
   FilterResponse_t response;
+  text_t toplink, endtoplink;
 
   recptproto *collectproto = protos->getrecptproto (collection, logout);
@@ -150 +159 @@
     // _httpiconthispaper_
     disp.setmacro ("httpiconthispaper", "document", "_httpcollimg_/" + series + "/cover");
+
+    // _headerextra_, _toplink_, _endtoplink_
+    metadata.insert ("doctype");
+    text_t headerextra;
+    if (get_info (arg_d, collection, metadata, false, collectproto, response, logout)) {
+      if (response.docInfo[0].metadata["doctype"].values[0] == "Description") {
+    headerextra = "_abstract_";
+    toplink = substr (arg_d.begin(), arg_d.end()-8);
+    toplink = "<a href=\"_httpdocument_&gg=prev&cl=_cgiargcl_&d=" + dm_safe (toplink) + "\">";
+    endtoplink = "</a>";
+      } else if (response.docInfo[0].metadata["doctype"].values[0] != "Commentary") {
+    get_top (arg_d, toplink);
+    toplink = "<a href=\"_httpdocument_&gg=prev&cl=_cgiargcl_&d=" + dm_safe (toplink) + "\">";
+    endtoplink = "</a>";
+      }
+    }
+    disp.setmacro ("headerextra", "Global", headerextra);
+    disp.setmacro ("toplink", "Global", toplink);
+    disp.setmacro ("endtoplink", "Global", endtoplink);
   }
 }