Changeset 16126

Timestamp:

2008-06-24T16:46:29+12:00 (16 years ago)

Author:

mdewsnip

Message:

More code restructuring.

File:

• gsdl/trunk/src/recpt/dynamicclassifieraction.cpp (modified) (2 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;
+
+  // Split the classifier node OID into its components, then remove any we've already dealt with
+  text_tlist classifier_node_OID_parts_remaining;
+  splitchar(classifier_node_OID.begin(), classifier_node_OID.end(), '|', classifier_node_OID_parts_remaining);
+  if (classifier_options["-group_by_first_character"] == "1")
+  {
+    classifier_node_OID_parts_remaining.pop_front();
+  }
+  if (classifier_options["-use_hlist_at_top"] == "1")
+  {
+    classifier_node_OID_parts_remaining.pop_front();
+  }
 
   // Simple case at the top level: just output the child classifier nodes
@@ -217 +230 @@
     }
 
-    // This is the classifier node OID without any hlist nodes
-    text_t classifier_node_OID_sans_hlists = classifier_node_OID;
-    if (classifier_node_OID == selected_hlist_node_OID)
-    {
-      classifier_node_OID_sans_hlists = "";
-    }
-    else if (starts_with (classifier_node_OID, selected_hlist_node_OID + "|"))
-    {
-      classifier_node_OID_sans_hlists = substr (classifier_node_OID.begin() + (selected_hlist_node_OID + "|").size(), classifier_node_OID.end());
-    }
-
-    // Determine the parent classifier node labels
-    text_tlist parent_classifier_node_labels;
-    splitchar(classifier_node_OID_sans_hlists.begin(), classifier_node_OID_sans_hlists.end(), '|', parent_classifier_node_labels);
-
     // Output the parent classifier nodes and the current classifier node
-    output_upper_classifier_nodes (selected_hlist_node_OID, parent_classifier_node_labels, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
+    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