Changeset 4936 for trunk/gsdl/src/recpt/documentaction.cpp

Timestamp:

2003-07-16T09:04:05+12:00 (21 years ago)

Author:

sjboddie

Message:

Added new format options for [DocTOC], [DocImage], [DocumentButtonDetach],
[DocumentButtonHighlight], [DocumentButtonExpandText], and
[DocumentButtonExpandContents]. These can all be inserted in a
DocumentText format string to allow more flexible arrangement of table of
contents, document buttons, etc.

File:

• trunk/gsdl/src/recpt/documentaction.cpp (modified) (13 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -25 +25 @@
 
 #include <string.h>
+#include <sstream>
+
 #include "documentaction.h"
 #include "browsetools.h"
@@ -416 +418 @@
   // _httppagehome_      overridden home url if html collections have own homepage
 
-  // _usability_ - a macro for remote usability reporting
+  // _usability_         a macro for remote usability reporting
 
   // must have a valid collection server to continue
+   
   text_t &collection = args["c"];
   if (collection.empty()) return;
@@ -630 +633 @@
 
   // must have a valid collection server to continue
-  text_t &collection = args["c"];
+
+   text_t &collection = args["c"];
   if (collection.empty()) return;
   recptproto *collectproto = protos->getrecptproto (collection, logout);
@@ -692 +696 @@
        //call function in formattools.cpp which will return the text of the 
        //related documents in a vertical list. This is the default format.
+
        if (get_info (arg_d, collection, metadata, options, false, collectproto, response, logout)) 
      relation += get_related_docs(collection, collectproto, response.docInfo[0], logout);
        
        //set macro to be the related document string
+
        disp.setmacro ("relateddoc", "document", relation); 
      }
@@ -837 +843 @@
         << "</html>\n";
       } else {
-    output_document (OID, args, collectproto, disp, outconvert, textout, logout);   
+    output_document (OID, args, collectproto, browsers, disp, outconvert, textout, logout); 
       }
       return true;
@@ -861 +867 @@
     if (!args["d"].empty()) {
       textout << outconvert << "<p>\n";
-      output_document (OID, args, collectproto, disp, outconvert, textout, logout);
+      output_document (OID, args, collectproto, browsers, disp, outconvert, textout, logout);
     }
 
@@ -872 +878 @@
                   const TermInfo_tarray &terminfo, const text_t &OID,
                   bool highlight, int hastxt, int wanttext, 
-                  text_t &collection, recptproto *collectproto, 
-                  displayclass &disp, outconvertclass &outconvert, 
-                  ostream &textout, ostream &logout,
-                  cgiargsclass &args) {
+                  text_t &collection, recptproto *collectproto,
+                  browsermapclass *browsers, displayclass &disp,
+                  outconvertclass &outconvert, ostream &textout,
+                  ostream &logout, cgiargsclass &args) {
   
   DocumentRequest_t docrequest;
@@ -901 +907 @@
       text_tmap options;
       options["text"] = docresponse.doc;
+      options["DocImage"] = get_cover_image();
+
+      ostringstream tmpstr(ostringstream::binary);
+      if (args["gc"] == "1") {
+     expanded_contents (args, 0, false, browsers, formatinfo, 
+                collectproto, disp, outconvert, tmpstr,
+                logout);
+      } else {
+     contracted_contents (args, 0, false, browsers, formatinfo, 
+                  collectproto, disp, outconvert, tmpstr, logout);
+      }
+      text_t tmp = (char *)(tmpstr.str().c_str());
+      int len = tmp.size();
+      char *ctmp = tmp.getcstr();
+      utf8inconvertclass utf82text_t;
+      utf82text_t.setinput(ctmp, len);
+      convertclass::status_t status;
+      utf82text_t.convert(tmp, status);
+      options["DocTOC"] = tmp;
+      delete ctmp;
+
+      options["DocumentButtonDetach"] = "_document:imagedetach_";
+      if (args["hl"] == "1") {
+     options["DocumentButtonHighlight"] = "_document:imagenohighlight_";
+      } else {
+     options["DocumentButtonHighlight"] = "_document:imagehighlight_";
+      }
+      if (args["gc"] == "1") {
+     options["DocumentButtonExpandContents"] = "_document:imagecontracttoc_";
+      } else {
+     options["DocumentButtonExpandContents"] = "_document:imageexpandtoc_";
+      }
+      if (args["gt"] == "1") {
+     options["DocumentButtonExpandText"] = "_document:imagecontracttext_";
+      } else {
+     options["DocumentButtonExpandText"] = "_document:imageexpandtext_";
+      }
+      
       text_t doctext 
      = get_formatted_string (collection, collectproto, docinfo, disp,
@@ -916 +960 @@
 
 void documentaction::output_document (const text_t &OID, cgiargsclass &args, 
-                      recptproto *collectproto, displayclass &disp, 
-                      outconvertclass &outconvert, ostream &textout, 
-                      ostream &logout) {
+                      recptproto *collectproto, browsermapclass *browsers,
+                      displayclass &disp, outconvertclass &outconvert,
+                      ostream &textout, ostream &logout) {
   FilterResponse_t inforesponse;
   FilterResponse_t queryresponse;
@@ -930 +974 @@
   // if we have a query string and highlighting is turned on we need
   // to redo the query to get the terms for highlighting
+  
   if (!args["q"].empty() && args.getintarg("hl")) {
     FilterRequest_t request;
@@ -972 +1017 @@
       output_text (inforesponse.docInfo[0], formatlistptr, queryresponse.termInfo, 
            OID, highlight, hastxt, wanttext, collection, collectproto, 
-           disp, outconvert, textout, logout, args);
+           browsers, disp, outconvert, textout, logout, args);
 
 
@@ -1015 +1060 @@
       output_text (thisdocinfo, formatlistptr, queryresponse.termInfo, 
                OID, highlight, hastxt, wanttext, collection, 
-               collectproto, disp, outconvert, textout, logout, args);
+               collectproto, browsers, disp, outconvert, textout, logout, args);
       
     }
@@ -1032 +1077 @@
       output_text (*sechere, formatlistptr, queryresponse.termInfo, 
                (*sechere).OID, highlight, shastxt, wanttext, collection, 
-               collectproto, disp, outconvert, textout, logout, args);
+               collectproto, browsers, disp, outconvert, textout, logout, args);
       count ++;
       sechere ++;