Changeset 16219

Timestamp:

2008-06-27T10:39:57+12:00 (15 years ago)

Author:

mdewsnip

Message:

Changed the ".pr" resolving code to use the hierarchy separator, so it works when a non-standard hierarchy separator has been specified.

File:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -159 +159 @@
 
   // Resolve any ".pr" bits at the end of the "dcn" argument
+  text_t classifier_node_separator = classifier_options["-split_using_hierarchy_separator"];
   if (ends_with (args["dcn"], ".pr"))
   {
     // Change the "dcn" argument to be the OID of the parent of the specified classifier node
-    text_t::iterator parent_classifier_node_OID_end = findlastchar (args["dcn"].begin(), args["dcn"].end(), '|');
-    if (parent_classifier_node_OID_end != args["dcn"].end())
-    {
-      args["dcn"] = substr (args["dcn"].begin(), parent_classifier_node_OID_end);
-    }
-    else
-    {
-      args["dcn"] = "";
-    }
+    text_tlist args_dcn_parts;
+    splitword (args["dcn"].begin(), args["dcn"].end(), classifier_node_separator, args_dcn_parts);
+    args_dcn_parts.pop_back();  // Remove the last part
+    joinchar (args_dcn_parts, classifier_node_separator, args["dcn"]);
   }
 
@@ -176 +172 @@
   text_t current_classifier_node_OID = "";
   text_t current_metadata_value_filter = "";
-  text_t classifier_node_separator = classifier_options["-split_using_hierarchy_separator"];
   int classifier_node_indent = 0;