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

Timestamp:

2003-07-18T04:50:19+12:00 (21 years ago)

Author:

sjboddie

Message:

More changes to the new document formatting code. Added an
AllowExtendedOptions format option which must be set to allow other
new options to work.

File:

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

trunk/gsdl/src/recpt/documentaction.cpp

@@ -25 +25 @@
 
 #include <string.h>
-#include <sstream>
 
 #include "documentaction.h"
@@ -592 +591 @@
          ((*format_here).second == "true"))
       formatinfo.DocumentUseHTML = true;
+    else if (((*format_here).first == "AllowExtendedOptions") && 
+         ((*format_here).second == "true"))
+      formatinfo.AllowExtendedOptions = true;
     else 
       formatinfo.formatstrings[(*format_here).first] = (*format_here).second;
@@ -907 +909 @@
       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_";
+
+      if (formatinfo.AllowExtendedOptions) {
+    load_extended_options(options, args, browsers, formatinfo, 
+                  collectproto, disp, outconvert, logout);
       }