Changeset 16065

Timestamp:

2008-06-19T12:01:01+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Changed the links generated for parent/current classifier nodes in vlistbrowserclass to use ".pr" instead of trying to work out the parent OID, to avoid this code needing to know about hierarchy separators.

Added code in dynamicclassifieraction for resolving the ".pr" bits.

Location:

gsdl/trunk/src/recpt

Files:

• dynamicclassifieraction.cpp (modified) (1 diff)
• vlistbrowserclass.cpp (modified) (1 diff)

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -158 +158 @@
   textout << outconvert << disp << classifier_header_format_statement << "\n";
 
+  // Resolve any ".pr" bits at the end of the "dcn" argument
+  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"] = "";
+    }
+  }
+
   // Output the dynamic classifier, beginning with the (optional) grouping nodes
   text_t selected_grouping_node_OID = "";

gsdl/trunk/src/recpt/vlistbrowserclass.cpp

@@ -394 +394 @@
       {
         icon = "_document:iconopenbookshelf_";
-
-        // dcn value is the OID of this node's parent
-        text_t::iterator hierarchy_split_position = findchar(section.OID.begin(), section.OID.end(), '|');
-        if (hierarchy_split_position != section.OID.end())
-        {
-          classifier_node_dcn = substr (section.OID.begin(), hierarchy_split_position);
-        }
+        classifier_node_dcn = section.OID + ".pr";
       }
       // Child node