Changeset 16043 for gsdl/trunk/src/recpt/hlistbrowserclass.cpp

Timestamp:

2008-06-18T13:23:27+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Moved most of the code from output_section_group (ResultDocInfo_t, ...) into output_section_group (FilterResponse_t, ...) (which was empty), because the second case is needed for the dynamic classifiers.

File:

• gsdl/trunk/src/recpt/hlistbrowserclass.cpp (modified) (6 diffs)

gsdl/trunk/src/recpt/hlistbrowserclass.cpp

@@ -25 +25 @@
 
 #include "hlistbrowserclass.h"
-#include <assert.h>
+#include "OIDtools.h"
 #include "recptprototools.h"
 
@@ -94 +94 @@
                          recptproto *collectproto, displayclass &disp, 
                          outconvertclass &outconvert, ostream &textout, 
-                         ostream &logout) {
-
+                         ostream &logout)
+{
   // expanded contents are going to cause some nasty recursions
   // so we'll only continue if being passed the current section
@@ -102 +102 @@
   // get all siblings
   FilterResponse_t response;
-  text_t &arg_cl = args["cl"];
   get_children (section.OID + ".pr", args["c"], args["l"], metadata, getParents, 
         collectproto, response, logout);
 
+  return output_section_group (response, args, collection, colnumber, formatlistptr, use_table, metadata, getParents, collectproto, disp, outconvert, textout, logout);
+}
+
+int hlistbrowserclass::output_section_group (FilterResponse_t &response, cgiargsclass &args,
+                         const text_t &collection, int colnumber, 
+                         format_t * formatlistptr, bool use_table, 
+                         text_tset &metadata, bool &getParents,
+                         recptproto * collectproto, displayclass &disp, 
+                         outconvertclass &outconvert, ostream &textout, 
+                         ostream &logout)
+{
   /* use_table is set to true if the format string starts with <td> */
   if (use_table || colnumber > 0) {
@@ -134 +144 @@
     text_t &doctype = (*tsibling).metadata["doctype"].values[0];
 
-    if ((*tsibling).OID == section.OID) {
+    if ((*tsibling).OID == args["cl"] || is_child_of ((*tsibling).OID, args["cl"])) {
       link.clear();
       highlight = true;   
@@ -142 +152 @@
     link += "&amp;cl=" + (*tsibling).OID + "\">";
       else {
-    link += "&amp;cl=" + arg_cl + "&amp;d=" + (*tsibling).OID;// + "\">";
+    link += "&amp;cl=" + args["cl"] + "&amp;d=" + (*tsibling).OID;// + "\">";
     // [modification to allow default document detach settings -- kjdon]
     if (args["xx"]=="1") {
@@ -182 +192 @@
   return 0;
 }
-
-int hlistbrowserclass::output_section_group (FilterResponse_t &/*sections*/, cgiargsclass &/*args*/,
-                         const text_t &/*collection*/, int /*colnumber*/, 
-                         format_t * /*formatlistptr*/, bool /*use_table*/, 
-                         text_tset &/*metadata*/, bool &/*getParents*/,
-                         recptproto * /*collectproto*/, displayclass &/*disp*/, 
-                         outconvertclass &/*outconvert*/, ostream &/*textout*/, 
-                         ostream &/*logout*/) {
-  return 0;
-}