Changeset 4972

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.

Location:

trunk/gsdl/src/recpt

Files:

• browsetools.cpp (modified) (6 diffs)
• browsetools.h (modified) (2 diffs)
• documentaction.cpp (modified) (3 diffs)
• formattools.cpp (modified) (1 diff)
• formattools.h (modified) (1 diff)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -29 +29 @@
 #include "browsetools.h"
 #include "OIDtools.h"
+#include "gsdlunicode.h"
+
+#include <sstream>
+
 
 // output_controls displays the detach, expand/contract contents,
@@ -101 +105 @@
 
 void output_titles (cgiargsclass &args, recptproto *collectproto, 
-            formatinfo_t &formatinfo, displayclass &disp, 
-            outconvertclass &outconvert, ostream &textout, 
-            ostream &logout) {
+            browsermapclass *browsermap, formatinfo_t &formatinfo,
+            displayclass &disp, outconvertclass &outconvert,
+            ostream &textout, ostream &logout) {
 
   if (args["d"].empty()) return;
@@ -117 +121 @@
     return;
 
-  text_tmap options; // no options
+  text_tmap options;
+  if (formatinfo.AllowExtendedOptions) {
+    load_extended_options(options, args, browsermap, formatinfo, 
+              collectproto, disp, outconvert, logout);
+  }
   textout << outconvert << disp 
       << get_formatted_string (args["c"],collectproto, response.docInfo[0], disp,
@@ -751 +759 @@
                  ostream &textout, ostream &logout) {
 
+  if (formatinfo.AllowExtendedOptions) {
+    // If AllowExtendedOptions is set DocumentButtons, DocumentContent, and
+    // DocumentImages are effectively disabled. We just output the
+    // DocumentHeading format string and return
+    output_titles (args, collectproto, browsermap, formatinfo, disp, outconvert, textout, logout);    
+    return;
+  }
+
   int tabcount = 0;
   bool havecontrols = false;
@@ -774 +790 @@
       output_cover_image (args, collectproto, disp, outconvert, textout, logout);
     else if (formatinfo.DocumentTitles)
-      output_titles (args, collectproto, formatinfo, disp, outconvert, textout, logout);
+      output_titles (args, collectproto, browsermap, formatinfo, disp, outconvert, textout, logout);
     if (args["u"] != "1") {
       output_controls (args, formatinfo.DocumentButtons, collectproto, disp, 
@@ -813 +829 @@
 }
 
+void load_extended_options(text_tmap &options, cgiargsclass &args, browsermapclass *browsers, 
+               formatinfo_t &formatinfo, recptproto *collectproto, 
+               displayclass &disp, outconvertclass &outconvert, ostream &logout) {
+
+  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_";
+  }
+}

trunk/gsdl/src/recpt/browsetools.h

@@ -69 +69 @@
 
 void output_titles (cgiargsclass &args, recptproto *collectproto, 
-            formatinfo_t &formatinfo, displayclass &disp, 
-            outconvertclass &outconvert, ostream &textout, 
-            ostream &logout);
+            browsermapclass *browsermap, formatinfo_t &formatinfo,
+            displayclass &disp, outconvertclass &outconvert,
+            ostream &textout, ostream &logout);
 
 void output_controls (cgiargsclass &args, const text_tarray &ibuttons,
@@ -84 +84 @@
              ostream &textout, ostream &logout);
 
+void load_extended_options(text_tmap &options, cgiargsclass &args, browsermapclass *browsers, 
+               formatinfo_t &formatinfo, recptproto *collectproto, 
+               displayclass &disp, outconvertclass &outconvert, ostream &logout);
 
 #endif

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);
       }
       

trunk/gsdl/src/recpt/formattools.cpp

@@ -86 +86 @@
   formatstrings.erase (formatstrings.begin(), formatstrings.end());
   DocumentUseHTML = false;
+  AllowExtendedOptions = false;
 }
 

trunk/gsdl/src/recpt/formattools.h

@@ -96 +96 @@
   text_tmap formatstrings;
   bool DocumentUseHTML;
+  bool AllowExtendedOptions;
 };