Changeset 16112

Timestamp:

2008-06-24T10:28:55+12:00 (16 years ago)

Author:

mdewsnip

Message:

Removed some duplicate code by calling display_classifier_nodes() from output_grouping_nodes().

File:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -296 +296 @@
   }
 
+  // Add the necessary metadata to the grouping nodes
   text_t selected_grouping_node_OID = "";
   ResultDocInfo_tarray::iterator grouping_node_iterator = grouping_nodes_response.docInfo.begin();
@@ -314 +315 @@
   }
 
-  // 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 = "HList";
-  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);
-
   // Display the grouping nodes
-  bptr->output_section_group (grouping_nodes_response, args, args["c"], 0, formatlistptr, use_table, metadata, getParents, collectproto, disp, outconvert, textout, logout);
+  display_classifier_nodes (grouping_nodes_response, "HList", 0, args, collectproto, browsers, disp, outconvert, textout, logout);
 
   return selected_grouping_node_OID;
@@ -423 +409 @@
   }
 
-  // Display the child classifier nodes
+  // Add the necessary metadata to the child classifier nodes
   FilterResponse_t child_classifier_nodes_response;
   map<text_t, int, lttext_t>::iterator child_classifier_nodes_iterator = child_classifier_nodes.begin();
@@ -445 +431 @@
   }
 
+  // Display the child classifier nodes
   display_classifier_nodes (child_classifier_nodes_response, "VList", classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
 }