Changeset 16096

Timestamp:

2008-06-20 17:00:59 (7 months 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.

Files:

• 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;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    classifier_node_indent++;
-
@@ -467 +475 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
-{
-  // 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;