Changeset 16131

Timestamp:

2008-06-24T17:51:53+12:00 (16 years ago)

Author:

mdewsnip

Message:

Tidied up a last bit of grouping/hlist code.

File:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -179 +179 @@
 
   // (Optional) Output an hlist to group the classifier nodes into buckets based on the first character
-  text_t selected_grouping_node_OID = "";
   if (classifier_options["-group_by_first_character"] == "1")
   {
-    selected_grouping_node_OID = output_hlist_classifier_nodes (current_classifier_node_OID, current_metadata_value_filter, "substr(value,1,1)", classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
+    text_t selected_grouping_node_OID = output_hlist_classifier_nodes (current_classifier_node_OID, current_metadata_value_filter, "substr(value,1,1)", classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
 
     current_classifier_node_OID = selected_grouping_node_OID;
@@ -189 +188 @@
 
   // (Optional) Output an hlist instead of a vlist at the top level
-  text_t selected_hlist_node_OID = "";
   if (classifier_options["-use_hlist_at_top"] == "1")
   {
-    selected_hlist_node_OID = output_hlist_classifier_nodes (current_classifier_node_OID, current_metadata_value_filter, "", classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
+    text_t selected_hlist_node_OID = output_hlist_classifier_nodes (current_classifier_node_OID, current_metadata_value_filter, "", classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
 
     current_classifier_node_OID = selected_hlist_node_OID;
-    current_metadata_value_filter = selected_hlist_node_OID + "*";  // !! WRONG
   }
 
@@ -218 +215 @@
 
   // Simple case at the top level: just output the child classifier nodes
-  if (classifier_node_OID == selected_grouping_node_OID)
-  {
-    output_child_classifier_nodes (current_classifier_node_OID, "", current_metadata_value_filter, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
+  if (classifier_node_metadata_value == "")
+  {
+    output_child_classifier_nodes (classifier_node_OID, classifier_node_metadata_value, current_metadata_value_filter, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
   }