Changeset 737 for trunk/gsdl/src/recpt

Timestamp:

1999-10-24T20:22:37+13:00 (25 years ago)

Author:

sjboddie

Message:

added a FullTOC option

File:

• trunk/gsdl/src/recpt/browsetools.cpp (modified) (14 diffs)

trunk/gsdl/src/recpt/browsetools.cpp

@@ -29 +29 @@
 /*
    $Log$
+   Revision 1.32  1999/10/24 07:22:37  sjboddie
+   added a FullTOC option
+
    Revision 1.31  1999/10/20 03:54:20  sjboddie
    problem with expanded contents
@@ -269 +272 @@
 
 
-static void recurse_contents (ResultDocInfo_t &section, cgiargsclass &args,
+static void recurse_contents (ResultDocInfo_t &section, cgiargsclass &args, bool fulltoc,
                   browserclass *bptr, text_tset &metadata, bool &getParents, 
                   format_t *formatlistptr, format_tmap &formatlistmap, 
                   formatinfo_t &formatinfo, browsermapclass *browsermap, 
-                  int colnumber, recptproto *collectproto, displayclass &disp, 
+                  int tabcount, recptproto *collectproto, displayclass &disp, 
                   outconvertclass &outconvert, ostream &textout, ostream &logout) {
   text_t formatstring;
 
   bool is_classify = false;
-  if (args["d"].empty()) is_classify = true;
+  if (args["d"].empty() || fulltoc) is_classify = true;
 
   // output this section 
   bool use_table = is_table_content (formatlistptr);
-  colnumber += bptr->output_section_group (section, args, colnumber, formatlistptr, use_table, 
-                       metadata, getParents, collectproto, disp, outconvert, 
-                       textout, logout);
+  tabcount += bptr->output_section_group (section, args, tabcount, formatlistptr, use_table, 
+                      metadata, getParents, collectproto, disp, outconvert, 
+                      textout, logout);
 
   text_t classification;
   if (!is_classify) classification = "Document";
-  else get_top (section.OID, classification);
+  else get_top (args["cl"], classification);
 
   int haschildren = section.metadata["haschildren"].values[0].getint();
   const text_t &doctype = section.metadata["doctype"].values[0];
   text_t classifytype = section.metadata["childtype"].values[0];
-  // HLists are displayed as VLists when contents are expanded,
-  // Paged documents are displayed as HLists
-  if (classifytype == "HList") classifytype = "VList";
+  // HLists and DateLists are displayed as VLists when contents 
+  // are expanded, Paged documents are displayed as HLists
+  if (classifytype == "HList" || classifytype == "DateList") classifytype = "VList";
   if (classifytype == "Paged") classifytype = "HList";
 
   // recurse through children
-  if ((haschildren == 1) && ((!is_classify) || (doctype == "classify"))) {
+  if ((haschildren == 1) && (!is_classify || fulltoc || doctype == "classify")) {
 
     // get browser for displaying children
@@ -325 +328 @@
 
     while (thisdoc != lastdoc) {
-      recurse_contents (*thisdoc, args, bptr, metadata, getParents, 
+      recurse_contents (*thisdoc, args, fulltoc, bptr, metadata, getParents, 
             formatlistptr, formatlistmap, formatinfo, browsermap, 
-            colnumber, collectproto, disp, outconvert, textout, logout);
+            tabcount, collectproto, disp, outconvert, textout, logout);
       thisdoc ++;
     }
@@ -341 +344 @@
 // the current one
 
-static void expanded_contents (cgiargsclass &args, browsermapclass *browsermap, 
-                   formatinfo_t &formatinfo, recptproto *collectproto, 
-                   displayclass &disp, outconvertclass &outconvert, 
-                   ostream &textout, ostream &logout) {
+static void expanded_contents (cgiargsclass &args, int tabcount, bool fulltoc,
+                   browsermapclass *browsermap, formatinfo_t &formatinfo, 
+                   recptproto *collectproto, displayclass &disp, 
+                   outconvertclass &outconvert, ostream &textout, 
+                   ostream &logout) {
   
   if (args["d"].empty() && args["cl"].empty()) return;
@@ -353 +357 @@
   text_tset metadata;
   text_t classifytype, classification, formatstring;
-  int colnumber = 0;
 
   if (!args["d"].empty()) {
-    // document level - expand from top
-    get_top (args["d"], OID);
-    classification = "Document";
+    // document level
+    if (fulltoc) {
+      get_top (args["cl"], OID);
+      classification = OID;
+    }
+    else {
+      // always expand document level from top
+      get_top (args["d"], OID);
+      classification = "Document";
+    }
   } else {
     // classification level
@@ -416 +426 @@
   formatlistmap[formatstring] = formatlistptr;
 
-  recurse_contents (response.docInfo[0], args, bptr, metadata, 
+  recurse_contents (response.docInfo[0], args, fulltoc, bptr, metadata, 
             getParents, formatlistptr, formatlistmap, formatinfo, browsermap, 
-            colnumber, collectproto, disp, outconvert, textout, logout);
+            tabcount, collectproto, disp, outconvert, textout, logout);
 
   // clean up format list pointers
@@ -485 +495 @@
                 browsermapclass *browsermap, formatinfo_t &formatinfo, 
                 format_tmap &formatlistmap, const text_t &classification,
-                int &colnumber, text_tset &metadata, bool &getParents,
+                int &tabcount, text_tset &metadata, bool &getParents,
                 recptproto *collectproto, displayclass &disp, 
                 outconvertclass &outconvert, ostream &textout, 
@@ -523 +533 @@
     
     use_table = is_table_content (formatlistptr);
-    colnumber += bptr->output_section_group (*thisparent, args, colnumber, formatlistptr, use_table, 
-                         metadata, getParents, collectproto, disp, outconvert, 
-                         textout, logout);
+    tabcount += bptr->output_section_group (*thisparent, args, tabcount, formatlistptr, 
+                        use_table, metadata, getParents, collectproto, 
+                        disp, outconvert, textout, logout);
     first = false;
     thisparent ++;
@@ -532 +542 @@
 
 
-static void contracted_contents (cgiargsclass &args, browsermapclass *browsermap,
-                 formatinfo_t &formatinfo, recptproto *collectproto,
-                 displayclass &disp, outconvertclass &outconvert,
-                 ostream &textout, ostream &logout) {
+static void contracted_contents (cgiargsclass &args, int tabcount, bool fulltoc, 
+                 browsermapclass *browsermap, formatinfo_t &formatinfo, 
+                 recptproto *collectproto, displayclass &disp, 
+                 outconvertclass &outconvert, ostream &textout, 
+                 ostream &logout) {
   FilterResponse_t response;
   text_tset metadata;
@@ -546 +557 @@
     OID = args["cl"];
     get_top (OID, classification);
-  } 
-  int colnumber = 0;
+  } else if (fulltoc)
+    get_top (args["cl"], classification);    
 
   bool haschildren = has_children (OID, args["c"], collectproto, logout);
 
+  if ((!args["d"].empty()) && fulltoc)
+    get_parents_array (args["cl"] + ".fc", parents);
   if (haschildren) get_parents_array (OID + ".fc", parents);
   else get_parents_array (OID, parents);
@@ -572 +585 @@
     // display each parent
     output_parents (response, args, browsermap, formatinfo, formatlistmap, 
-            classification, colnumber, metadata, getParents, 
+            classification, tabcount, metadata, getParents, 
             collectproto, disp, outconvert, textout, logout);
     
@@ -618 +631 @@
   // display children
   bool use_table = is_table_content (formatlistptr);
-  bptr->output_section_group (response, args, colnumber, formatlistptr, use_table, 
+  bptr->output_section_group (response, args, tabcount, formatlistptr, use_table, 
                   metadata, getParents, collectproto, disp, outconvert, 
                   textout, logout);
@@ -630 +643 @@
                  ostream &textout, ostream &logout) {
 
+  int tabcount = 0;
   bool havecontrols = false;
+  bool fulltoc = false;
+
+  if (args["cl"] != "search") {
+    // see if there's a FullTOC string
+    text_t cl_top, full_toc;
+    get_top (args["cl"], cl_top);
+    if (get_formatstring (cl_top, "FullTOC", formatinfo.formatstrings, full_toc))
+      if (full_toc == "true") fulltoc = true;
+  }
   
   // get the cover image (if there is one) and the control buttons
   // if we're inside a book
-  if (!args["d"].empty()) {
+  if ((!fulltoc) && (!args["d"].empty())) {
     textout << "<p><table cellpadding=0 cellspacing=0><tr>\n";
     textout << "<td valign=top";
-    if (formatinfo.DocumentContents) textout << "width=200>\n";
-    else textout << "width=100%>\n";
+    if (formatinfo.DocumentContents) textout << " width=200>\n";
+    else textout << " width=100%>\n";
     if (formatinfo.DocumentImages) 
       output_cover_image (args, collectproto, disp, outconvert, textout, logout);
@@ -653 +676 @@
       
       // expanded table of contents
-      expanded_contents (args, browsermap, formatinfo, collectproto, 
-             disp, outconvert, textout, logout);
+      expanded_contents (args, tabcount, fulltoc, browsermap, formatinfo, 
+             collectproto, disp, outconvert, textout, logout);
     } else {
       
       // contracted table of contents
-      contracted_contents (args, browsermap, formatinfo, collectproto, 
-               disp, outconvert, textout, logout);
+      contracted_contents (args, tabcount, fulltoc, browsermap, formatinfo, 
+               collectproto, disp, outconvert, textout, logout);
     }
   }