Changeset 16128

Timestamp:

2008-06-24T16:59:28+12:00 (16 years ago)

Author:

mdewsnip

Message:

Removed some grouping node code from the main block.

File:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -200 +200 @@
   // args["dcn"] may have been modified by output_hlist_classifier_nodes() above
   text_t classifier_node_OID = args["dcn"];
-  logout << "Classifier node OID: " << classifier_node_OID << endl;
+  text_t classifier_node_metadata_value = classifier_node_OID;
 
   // Split the classifier node OID into its components, then remove any we've already dealt with
@@ -208 +208 @@
   {
     classifier_node_OID_parts_remaining.pop_front();
+
+    // Update classifier_node_metadata_value to remove any grouping node components
+    joinchar (classifier_node_OID_parts_remaining, '|', classifier_node_metadata_value);
   }
   if (classifier_options["-use_hlist_at_top"] == "1")
@@ -223 +226 @@
   else
   {
-    // This is the classifier node OID without any grouping information
-    text_t classifier_node_OID_sans_grouping = classifier_node_OID;
-    if (starts_with (classifier_node_OID, selected_grouping_node_OID + "|"))
-    {
-      classifier_node_OID_sans_grouping = substr (classifier_node_OID.begin() + (selected_grouping_node_OID + "|").size(), classifier_node_OID.end());
-    }
-
     // Output the parent classifier nodes and the current classifier node
     output_upper_classifier_nodes (current_classifier_node_OID, classifier_node_OID_parts_remaining, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
 
     // Output the child classifier nodes
-    text_t classifier_node_metadata_value = classifier_node_OID_sans_grouping;
     text_t metadata_value_filter = classifier_node_metadata_value + "|*";
     output_child_classifier_nodes (classifier_node_OID, classifier_node_metadata_value, metadata_value_filter, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);