Changeset 16118

Timestamp:

2008-06-24T13:38:14+12:00 (15 years ago)

Author:

mdewsnip

Message:

Minor improvements to code.

File:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -174 +174 @@
 
   // Prepare to output the dynamic classifier
-  text_t classifier_node_OID = args["dcn"];
+  text_t current_classifier_node_OID = "";
+  text_t current_metadata_value_filter = "";
   int classifier_node_indent = 0;
 
@@ -181 +182 @@
   if (!classifier_options["-group_using"].empty())
   {
-    selected_grouping_node_OID = output_hlist_classifier_nodes ("", "", classifier_options["-group_using"], classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
-
-    classifier_node_OID = args["dcn"];  // args["dcn"] may have been modified by output_grouping_nodes()
+    selected_grouping_node_OID = output_hlist_classifier_nodes (current_classifier_node_OID, current_metadata_value_filter, classifier_options["-group_using"], classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
+
+    current_classifier_node_OID = selected_grouping_node_OID;
+    current_metadata_value_filter = selected_grouping_node_OID + "*";
   }
 
@@ -190 +192 @@
   if (classifier_options["-use_hlist_at_top"] == "1")
   {
-    text_t parent_classifier_node_OID = selected_grouping_node_OID;
-    text_t classifier_node_metadata_value = selected_grouping_node_OID;
-    text_t metadata_value_filter = selected_grouping_node_OID + "*";
-    selected_hlist_node_OID = output_hlist_classifier_nodes (parent_classifier_node_OID, metadata_value_filter, "", classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
-    classifier_node_OID = args["dcn"];  // args["dcn"] may have been modified by output_hlist_classifier_nodes()
-  }
+    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
+  }
+
+  // args["dcn"] may have been modified by output_hlist_classifier_nodes() above
+  text_t classifier_node_OID = args["dcn"];
 
   // Simple case at the top level: just output the child classifier nodes