Changeset 16096

Timestamp:

2008-06-20T17:00:59+12:00 (16 years ago)

Author:

mdewsnip

Message:

Added a new display_classifier_nodes() to eventually replace display_classifier_node(), and changed output_upper_classifier_nodes() to use this. This is required for outputting hlists instead of vlists and also to fix an HTML validation problem.

File:

• gsdl/trunk/src/recpt/dynamicclassifieraction.cpp (modified) (3 diffs)

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -351 +351 @@
     upper_classifier_node_OID += (upper_classifier_node_OID != "" ? "|" : "");
     upper_classifier_node_OID += *upper_classifier_node_labels_iterator;
-    text_t upper_classifier_node_label = *upper_classifier_node_labels_iterator;
-    text_t upper_classifier_node_numleafdocs = "?";  // We can't determine this without more database requests
-    display_classifier_node (upper_classifier_node_OID, upper_classifier_node_label, upper_classifier_node_numleafdocs, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
+
+    ResultDocInfo_t upper_classifier_node;
+    upper_classifier_node.OID = upper_classifier_node_OID;
+    upper_classifier_node.metadata["doctype"].values.push_back ("classify");
+    upper_classifier_node.metadata["haschildren"].values.push_back ("1");
+    upper_classifier_node.metadata["numleafdocs"].values.push_back ("?");  // We can't determine this without more database requests
+    upper_classifier_node.metadata["Title"].values.push_back (*upper_classifier_node_labels_iterator);
+
+    FilterResponse_t upper_classifier_node_response;
+    upper_classifier_node_response.docInfo.push_back(upper_classifier_node);
+    display_classifier_nodes (upper_classifier_node_response, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
     classifier_node_indent++;
 
@@ -467 +475 @@
 
 
-void dynamicclassifieraction::display_document_nodes (FilterResponse_t documents_response, int document_nodes_indent,
-                              cgiargsclass &args, recptproto *collectproto,
-                              browsermapclass *browsers, displayclass &disp,
-                              outconvertclass &outconvert, ostream &textout,
-                              ostream &logout)
+void dynamicclassifieraction::display_classifier_nodes (FilterResponse_t classifier_nodes_response,
+                                int classifier_node_indent,
+                            cgiargsclass &args, recptproto *collectproto,
+                            browsermapclass *browsers, displayclass &disp,
+                            outconvertclass &outconvert, ostream &textout,
+                            ostream &logout)
 {
   // Get the format statement for this classifier if there is one, or use the browser's default otherwise
@@ -488 +497 @@
   bool use_table = is_table_content (formatlistptr);
 
+  // Display the classifier nodes
+  bptr->output_section_group (classifier_nodes_response, args, args["c"], classifier_node_indent, formatlistptr, use_table, metadata, getParents, collectproto, disp, outconvert, textout, logout);
+}
+
+
+void dynamicclassifieraction::display_document_nodes (FilterResponse_t documents_response, int document_nodes_indent,
+                              cgiargsclass &args, recptproto *collectproto,
+                              browsermapclass *browsers, displayclass &disp,
+                              outconvertclass &outconvert, ostream &textout,
+                              ostream &logout)
+{
+  // Get the format statement for this classifier if there is one, or use the browser's default otherwise
+  text_t formatstring;
+  text_t classifier_type = "VList";
+  browserclass *bptr = browsers->getbrowser (classifier_type);
+  ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr (collectproto, args["c"], logout);
+  if (!get_formatstring (args["dcl"], classifier_type, cinfo->format, formatstring))
+  {
+    formatstring = bptr->get_default_formatstring();
+  }
+  format_t *formatlistptr = new format_t();
+  text_tset metadata;
+  bool getParents = false;
+  parse_formatstring (formatstring, formatlistptr, metadata, getParents);
+  bool use_table = is_table_content (formatlistptr);
+
   // Request the necessary metadata for displaying the documents
   text_tarray document_OIDs;