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

Timestamp:

2000-04-07T16:40:45+12:00 (24 years ago)

Author:

sjboddie

Message:

Reverted back to old DocumentHeader, DocumentTitles, DocumentImages etc.
from DocumentColumns stuff. I'll move the DocumentColumns stuff to a
separate development branch (New_Config_Format-branch) for now. The plan
is to redesign the configuration file format a bit and limit the number of
distributions floating around that take different configuration formats).

File:

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

trunk/gsdl/src/recpt/documentaction.cpp

@@ -28 +28 @@
 /*
    $Log$
-   Revision 1.36  2000/04/03 07:26:28  sjboddie
-   replaced old DocumentIcon and DocumentContents format options
-   with DocumentColumn stuff
-
-   Revision 1.35  2000/03/31 03:04:31  nzdl
-   tidied up some of the browsing code - replaced DocumentImages,
-   DocumentTitles and DocumentHeading with DocumentIcon
+   Revision 1.37  2000/04/07 04:40:44  sjboddie
+   Reverted back to old DocumentHeader, DocumentTitles, DocumentImages etc.
+   from DocumentColumns stuff. I'll move the DocumentColumns stuff to a
+   separate development branch (New_Config_Format-branch) for now. The plan
+   is to redesign the configuration file format a bit and limit the number of
+   distributions floating around that take different configuration formats).
 
    Revision 1.34  2000/02/15 22:53:49  kjm18
@@ -293 +292 @@
 
 documentaction::~documentaction () {
-}
-
-
-// output_controls displays the detach, expand/contract contents,
-// expand/contract text and highlighting/no highlighting buttons
-void documentaction::output_controls (cgiargsclass &args, const text_tarray &ibuttons,
-                      recptproto * /*collectproto*/, displayclass &disp, 
-                      outconvertclass &outconvert, ostream &textout, 
-                      ostream &/*logout*/) {
-
-  if (args["u"] != "1") {
-    
-    FilterResponse_t response;
-    text_tarray metadata;
-    text_tarray buttons;
-    
-    text_tarray::const_iterator here = ibuttons.begin();
-    text_tarray::const_iterator end = ibuttons.end();
-    
-    while (here != end) {
-      
-      if (*here == "Detach")
-    buttons.push_back ("_document:imagedetach_");
-      else if (*here == "Highlight") {
-    if (args["hl"] == "1") 
-      buttons.push_back ("_document:imagenohighlight_");
-    else 
-      buttons.push_back ("_document:imagehighlight_");
-      } else if (*here == "Expand Contents") {
-    if (args["gc"] == "1")
-      buttons.push_back ("_document:imagecontracttoc_");
-    else 
-      buttons.push_back ("_document:imageexpandtoc_");
-      } else if (*here == "Expand Text") {
-    if (args.getintarg("gt"))
-      buttons.push_back ("_document:imagecontracttext_");
-    else 
-      buttons.push_back ("_document:imageexpandtext_");
-      }
-      here ++;
-    }
-    
-    here = buttons.begin();
-    end = buttons.end();
-    int count = 0;
-    while (here != end) {
-      if ((count != 0) && ((count % 2) == 0)) textout << "<br>\n";
-      textout << outconvert << disp << *here;
-      count ++;
-      here ++;
-    }
-  }
-}
-
-void documentaction::output_formatstring (const text_t &OID, const text_t &collection, 
-                      recptproto *collectproto, const text_t &formatstring, 
-                      displayclass &disp, outconvertclass &outconvert, 
-                      ostream &textout, ostream &logout) {
-
-  if (OID.empty()) return;
-  
-  text_tset metadata;
-  bool getParents;
-  FilterResponse_t response;
-
-  format_t *formatlistptr = new format_t();
-  parse_formatstring (formatstring, formatlistptr, metadata, getParents);
-
-  if (!get_info (OID, collection, metadata, getParents, collectproto, response, logout))
-    return;
-
-  textout << outconvert << disp << get_formatted_string (response.docInfo[0], formatlistptr);
-}
-
-// output_headerstring outputs a formatstring that may contain the 
-// [Buttons] and [TOC] elements. It separates these elements out,
-// calling output_controls and output_toc respectively to process
-// the special elements. Calls output_formatstring to process the 
-// remaining bits of formatstring
-void documentaction::output_headerstring (cgiargsclass &args, recptproto *collectproto,
-                      const text_t &formatstring, browsermapclass *browsers,
-                      displayclass &disp, outconvertclass &outconvert, 
-                      ostream &textout, ostream &logout) {
-
-  text_t &OID = args["d"];
-  if (OID.empty()) OID = args["cl"];
-  text_t &collection = args["c"];
-
-  text_t::const_iterator here = formatstring.begin();
-  text_t::const_iterator end = formatstring.end();
-
-  text_t currentstring;
-  while (here != end) {
-    if ((*here == '[') && (*(here+1) == 'B') && (*(here+2) == 'u') &&
-    (*(here+3) == 't') && (*(here+4) == 't') && (*(here+5) == 'o') &&
-    (*(here+6) == 'n') && (*(here+7) == 's') && (*(here+8) == ']')) {
-      here += 8;
-      if (!currentstring.empty()) {
-    output_formatstring (OID, collection, collectproto, currentstring,
-                 disp, outconvert, textout, logout);
-    currentstring.clear();
-      }
-      
-      output_controls (args, formatinfo.DocumentButtons, collectproto, 
-               disp, outconvert, textout, logout);
-
-    } else if ((*here == '[') && (*(here+1) == 'T') && (*(here+2) == 'O') &&
-    (*(here+3) == 'C') && (*(here+4) == ']')) {
-      here += 4;
-      if (!currentstring.empty()) {
-    output_formatstring (OID, collection, collectproto, currentstring,
-                 disp, outconvert, textout, logout);
-    currentstring.clear();
-      }
-
-      output_toc (args, browsers, formatinfo.formatstrings, collectproto,
-          disp, outconvert, textout, logout);
-
-    } else {
-      currentstring.push_back (*here);
-    }
-
-    here ++;
-  }
-
-  if (!currentstring.empty())
-    output_formatstring (OID, collection, collectproto, currentstring,
-             disp, outconvert, textout, logout);
 }
 
@@ -740 +611 @@
 
   while (format_here != format_end) {
-    if ((*format_here).first == "DocumentColumns")
-      formatinfo.DocumentColumns = (*format_here).second; 
-    else if ((*format_here).first == "DocumentColumnsTotalWidth")
-      formatinfo.DocumentColumnsTotalWidth = (*format_here).second;
-    else if ((*format_here).first == "DocumentColumnLeft")
-      formatinfo.DocumentColumnLeft = (*format_here).second;
-    else if ((*format_here).first == "DocumentColumnLeftWidth")
-      formatinfo.DocumentColumnLeftWidth = (*format_here).second;
-    else if ((*format_here).first == "DocumentColumnRight")
-      formatinfo.DocumentColumnRight = (*format_here).second;
+    if (((*format_here).first == "DocumentImages") && 
+    ((*format_here).second == "true"))
+      formatinfo.DocumentImages = true;
+    else if (((*format_here).first == "DocumentTitles") && 
+         ((*format_here).second == "false"))
+      formatinfo.DocumentTitles = false;
+    else if ((*format_here).first == "DocumentHeading") 
+      formatinfo.DocumentHeading = (*format_here).second;
+    else if (((*format_here).first == "DocumentContents") && 
+         ((*format_here).second == "false"))
+      formatinfo.DocumentContents = false;
     else if (((*format_here).first == "DocumentArrowsBottom") && 
          ((*format_here).second == "false"))
@@ -977 +849 @@
     textout << outconvert << disp << "_document:header_\n"
         << "_document:content_\n";
-
-    // currently only display header information at document level,
-    // this should probably be changed to handle stuff like CL1Columns
-    if (!args["d"].empty()) {
-      textout << outconvert << disp 
-          << "<p><center><table width=_pagewidth_><tr>\n"
-          << "<td valign=top";
-      if (formatinfo.DocumentColumns == "2") {
-    textout << outconvert << disp
-        << " width=" << formatinfo.DocumentColumnLeftWidth << ">\n";
-    output_headerstring (args, collectproto, formatinfo.DocumentColumnLeft, 
-                 browsers, disp, outconvert, textout, logout);
-    textout << "\n</td><td valign=top>\n";
-    output_headerstring (args, collectproto, formatinfo.DocumentColumnRight, 
-                 browsers, disp, outconvert, textout, logout);
-      } else {
-    textout << " width=100%>\n";
-    output_headerstring (args, collectproto, formatinfo.DocumentColumnLeft, 
-                 browsers, disp, outconvert, textout, logout);
-      }
-      textout << "\n</td></tr></table></center>\n";
-    } else {
-      // classification level
-      output_toc (args, browsers, formatinfo.formatstrings, collectproto,
-          disp, outconvert, textout, logout);
-    }
+      
+    // output the table of contents
+    output_toc (args, browsers, formatinfo, collectproto, 
+        disp, outconvert, textout, logout);
     
     // output the document text
@@ -1248 +1098 @@
   textout << outconvert << disp << buffer;
 }
+
+
+
+
+
+
+
+
+
+
+