Changeset 12183

Timestamp:

2006-07-12T21:48:07+12:00 (18 years ago)

Author:

sjboddie

Message:

Added expand_from_current_level option to browsetoolsclass::expanded_contents

Location:

trunk/gsdl/src/recpt

Files:

• browsetoolsclass.cpp (modified) (5 diffs)
• browsetoolsclass.h (modified) (4 diffs)

trunk/gsdl/src/recpt/browsetoolsclass.cpp

@@ -214 +214 @@
 // for an HList when contents are expanded (i.e. it's displayed as a VList)
 //
-// if we're inside a document we expand all contents from the top,
-// if we're at classification level we'll just expand out those contents below 
-// the current one
+// if we're inside a document we expand all contents from the top (unless
+// expand_from_current_level is true), if we're at classification level we'll just
+// expand out those contents below the current one
 
 void browsetoolsclass::expanded_contents(cgiargsclass &args, int tabcount, bool fulltoc,
@@ -222 +222 @@
                                          recptproto *collectproto, displayclass &disp, 
                                          outconvertclass &outconvert, ostream &textout, 
-                                         ostream &logout)
+                                         ostream &logout, bool expand_from_current_level)
 {
   if (args["d"].empty() && args["cl"].empty()) return;
@@ -232 +232 @@
   text_t classifytype, classification, formatstring;
 
-  if (!args["d"].empty()) {
-    // 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
-    OID = args["cl"];
-    get_top (args["cl"], classification);
-  }
+  if (!args["d"].empty())
+    {
+      // document level
+      if (fulltoc)
+        {
+          get_top(args["cl"], OID);
+          classification = OID;
+        }
+      else 
+        {
+          classification = "Document";
+          if (expand_from_current_level)
+            {
+              OID = args["d"];
+            }
+          else
+            {
+              // Always expand document level from top, unless
+              // expand_from_current_level is true.
+              get_top(args["d"], OID);
+            }
+        }
+    }
+  else
+    {
+      // classification level
+      OID = args["cl"];
+      get_top(args["cl"], classification);
+    }
 
   // get classifytype of this level
@@ -815 +828 @@
       
     }
-    if (args.getintarg("gc") == 1) {
-      
-      // expanded table of contents
-      expanded_contents (args, tabcount, fulltoc, browsermap, formatinfo, 
-             collectproto, disp, outconvert, textout, logout);
-    } else if (args.getintarg("gc") == 2) {
-
-        // expand visible levels of table of contents
-      expand_show_contents(args, tabcount, fulltoc, browsermap, formatinfo,
-            collectproto, disp, outconvert, textout, logout);
-    } else {
-      
-      // contracted table of contents
-      contracted_contents (args, tabcount, fulltoc, browsermap, formatinfo, 
-               collectproto, disp, outconvert, textout, logout);
-    }
+    if (args.getintarg("gc") == 1)
+      {
+        // expanded table of contents
+        expanded_contents(args, tabcount, fulltoc, browsermap, formatinfo, 
+                          collectproto, disp, outconvert, textout, logout, false);
+      }
+    else if (args.getintarg("gc") == 2)
+      {
+        // expand visible levels of table of contents
+        expand_show_contents(args, tabcount, fulltoc, browsermap, formatinfo,
+                             collectproto, disp, outconvert, textout, logout);
+      }
+    else
+      {
+        // contracted table of contents
+        contracted_contents(args, tabcount, fulltoc, browsermap, formatinfo, 
+                            collectproto, disp, outconvert, textout, logout);
+      }
     textout << outconvert << "</div>\n";
   }
@@ -850 +865 @@
     {
       expanded_contents(args, 0, false, browsers, formatinfo, collectproto,
-                        disp, outconvert, *tmpstr, logout);
+                        disp, outconvert, *tmpstr, logout, false);
     }
   else

trunk/gsdl/src/recpt/browsetoolsclass.h

@@ -54 +54 @@
                                      displayclass &disp, outconvertclass &outconvert, ostream &logout);
 
-protected:
-
-  typedef map<text_t, format_t*, lttext_t> format_tmap; 
-
   virtual void expanded_contents(cgiargsclass &args, int tabcount, bool fulltoc,
                                  browsermapclass *browsermap, formatinfo_t &formatinfo, 
                                  recptproto *collectproto, displayclass &disp, 
                                  outconvertclass &outconvert, ostream &textout, 
-                                 ostream &logout);
+                                 ostream &logout, bool expand_from_current_level);
 
   virtual void expand_show_contents(cgiargsclass &args, int tabcount, bool fulltoc,
@@ -70 +66 @@
                                     ostream &logout);
 
+  virtual void contracted_contents(cgiargsclass &args, int tabcount, bool fulltoc, 
+                                   browsermapclass *browsermap, formatinfo_t &formatinfo, 
+                                   recptproto *collectproto, displayclass &disp, 
+                                   outconvertclass &outconvert, ostream &textout, 
+                                   ostream &logout);
+
+protected:
+
+  typedef map<text_t, format_t*, lttext_t> format_tmap; 
+
   virtual void recurse_contents_levels(text_tarray &parents, cgiargsclass &args, int coloffset,
                                        int tabcount, bool fulltoc, browsermapclass *browsermap,
@@ -75 +81 @@
                                        displayclass &disp, outconvertclass &outconvert,
                                        ostream &textout, ostream &logout);
-
-  virtual void contracted_contents(cgiargsclass &args, int tabcount, bool fulltoc, 
-                                   browsermapclass *browsermap, formatinfo_t &formatinfo, 
-                                   recptproto *collectproto, displayclass &disp, 
-                                   outconvertclass &outconvert, ostream &textout, 
-                                   ostream &logout);
 
   virtual void output_titles(cgiargsclass &args, recptproto *collectproto, 
@@ -120 +120 @@
                               outconvertclass &outconvert, ostream &textout, 
                               ostream &logout);
-
-
-
 };