Changeset 2874

Timestamp:

2001-12-02T10:25:14+13:00 (22 years ago)

Author:

sjboddie

Message:

* empty log message *

Location:

trunk/niupepa

Files:

• macros/npepa.dm (modified) (3 diffs)
• perllib/plugins/NPPlug.pm (modified) (1 diff)
• src/recpt/niupepabrowsetools.cpp (modified) (4 diffs)
• src/recpt/niupepadocaction.cpp (modified) (1 diff)
• src/recpt/niupepadocaction.h (modified) (1 diff)

trunk/niupepa/macros/npepa.dm

@@ -125 +125 @@
 _imageviewtext_ [c=niupepa] {_gsimage_(_httpcurrentdocument_&gg=text,_document:httpiconetextof_,_document:httpiconetexton_,etext,_document:texticonviewtext_)}
 
+_imagepdf_ [c=niupepa] {_gsimage_(_httpcurrentpdf_,_document:httpiconepdfof_,_document:iconepdfon_,epdf,_document:texticonpdf_)}
+
+_httpcurrentpdf_ [c=niupepa] {_httpprefix_/collect/niupepa/index/assoc/_thisOID_/paper.pdf}
+
 _imageviewabstract_ [c=niupepa] {_gsimage_(_httpdocument_&gg=text&cl=_cgiargcl_&d=_1_,_document:httpiconeabstrof_,_document:httpiconeabstron_,eabstr,_document:texticonviewabstract_)}
 
@@ -163 +167 @@
 _heightetextx_ [c=niupepa] {30}
 
+_httpiconepdfof_ [c=niupepa] {_httpprefix_/collect/niupepa/images/epdfof.gif}
+_httpiconepdfon_ [c=niupepa] {_httpprefix_/collect/niupepa/images/epdfon.gif}
+
 _httpiconeabstrof_ [c=niupepa] {_httpprefix_/collect/niupepa/images/eabstrof.gif}
 _httpiconeabstrof_ [c=niupepa,l=mi] {_httpprefix_/collect/niupepa/images/mi/eabstrof.gif}
@@ -194 +201 @@
 _texticonprevimage_ [c=niupepa] {View preview image of this page}
 _texticonviewtext_ [c=niupepa] {View the text of this page}
+_texticonpdf_ [c=niupepa] {View the PDF version of this paper}
 _texticoncommentary_ [c=niupepa] {View the commentary of this paper}
 _texticonviewabstract_ [c=niupepa] {View the English abstract of this issue}

trunk/niupepa/perllib/plugins/NPPlug.pm

@@ -202 +202 @@
     $doc_obj->set_utf8_metadata_element ($topsection, 'abstract', $abstract) if defined $abstract;
     $self->set_main_metadata ($doc_obj, $dir);
+
+    # process issue's pdf if one exists
+    my ($pdffile) = $file =~ /^([^\.]*)\.issue/i;
+    $pdffile .= ".pdf";
+    $pdffile = &util::filename_cat($dir, "pdf", $pdffile);
+    if (-e $pdffile) {
+    $doc_obj->set_utf8_metadata_element ($topsection, "haspdf", "1");
+    $doc_obj->associate_file($pdffile, "paper.pdf");
+    } else {
+    $doc_obj->set_utf8_metadata_element ($topsection, "haspdf", "0");
+    }
 
     open (ISSUEFILE, $filename) || die "couldn't open $filename\n";

trunk/niupepa/src/recpt/niupepabrowsetools.cpp

@@ -36 +36 @@
                      ostream &logout) {
 
-  bool hastxt = false, hasimg = false, hasprevimg = false;
+  bool hastxt = false, hasimg = false, hasprevimg = false, haspdf = false; 
   text_tarray buttons;
   text_t &arg_gg = args["gg"];
@@ -46 +46 @@
   metadata.insert ("hasimg");
   metadata.insert ("hasprevimg");
+  metadata.insert ("haspdf");
   metadata.insert ("doctype");
   if (!get_info (arg_d, args["c"], metadata, false, collectproto, response, logout))
@@ -53 +54 @@
   if (response.docInfo[0].metadata["hasimg"].values[0] == "1") hasimg = true;
   if (response.docInfo[0].metadata["hasprevimg"].values[0] == "1") hasprevimg = true;
+  if (response.docInfo[0].metadata["haspdf"].values[0] == "1") haspdf = true;
 
   MetadataInfo_tmap::iterator it = response.docInfo[0].metadata.find ("doctype");
@@ -90 +92 @@
     if (get_info (abstract, args["c"], metadata, false, collectproto, response, logout))
       buttons.push_back ("_document:imageviewabstract_(" + abstract + "&gg=text)");
+
+    if (haspdf) buttons.push_back ("_document:imagepdf_");
+
   } 
 

trunk/niupepa/src/recpt/niupepadocaction.cpp

@@ -51 +51 @@
 
 niupepadocaction::~niupepadocaction () {
-}
-
-void niupepadocaction::set_java_macros (cgiargsclass &args, displayclass &disp) {
-
-  text_t javaimagescontent = "_javaextras__javacommentary__javaviewabstract__javaviewpaper__javaabstractintro_";
-
-  text_t &arg_gg = args["gg"];
-
-  if (arg_gg == "full")
-    javaimagescontent += "_javaprevimage__javaviewtext_";
-  else if (arg_gg == "prev")
-    javaimagescontent += "_javafullimage__javaviewtext_";
-  else 
-    javaimagescontent += "_javafullimage__javaprevimage_";
-
-    
-  int arg_gt = args.getintarg("gt");
-  int arg_hl = args.getintarg("hl");
-
-  text_tarray::const_iterator button_here = formatinfo.DocumentButtons.begin();
-  text_tarray::const_iterator button_end = formatinfo.DocumentButtons.end();
-
-  while (button_here != button_end) {
-    if (*button_here == "Detach") 
-      javaimagescontent += "_javadetach_";
-    else if (*button_here == "Expand Text" && arg_gg == "text") {
-      if (arg_gt == 1)
-    javaimagescontent += "_javacontracttext__javacontinue_";
-      else if (arg_gt == 2)
-    javaimagescontent += "_javacontracttext_";
-      else
-    javaimagescontent += "_javaexpandtext_";
-    } else if (*button_here == "Highlight" && arg_gg == "text") {
-      if (arg_hl == 1)
-    javaimagescontent += "_javanohighlighting_";
-      else 
-    javaimagescontent += "_javahighlighting_";
-    }
-    button_here ++;
-  }
-  disp.setmacro ("javaimagescontent", "document", javaimagescontent);
 }
 

trunk/niupepa/src/recpt/niupepadocaction.h

@@ -36 +36 @@
 protected:
 
-  void set_java_macros (cgiargsclass &args, displayclass &disp);
-
   void output_document (const text_t &OID, cgiargsclass &args, 
             recptproto *collectproto, displayclass &disp,