Changeset 16214 for gsdl

Timestamp:

2008-06-26T16:20:35+12:00 (16 years ago)

Author:

mdewsnip

Message:

Changed slightly the OID arguments to output_hlist_classifier_nodes(), output_upper_classifier_nodes() and output_child_classifier_nodes() functions: these now have the next separator at the end. This is to help separate out the grouping separator character and the hierarchy separator character.

File:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -183 +183 @@
     text_t selected_grouping_node_OID = output_hlist_classifier_nodes (current_classifier_node_OID, current_metadata_value_filter, "substr(value,1,1)", classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
 
-    current_classifier_node_OID = selected_grouping_node_OID;
+    current_classifier_node_OID = selected_grouping_node_OID + "|";
     current_metadata_value_filter = selected_grouping_node_OID + "*";
   }
@@ -192 +192 @@
     text_t 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_classifier_node_OID = selected_hlist_node_OID + "|";
   }
 
@@ -237 +237 @@
 
     // Output the child classifier nodes
-    output_child_classifier_nodes (classifier_node_OID, classifier_node_metadata_value, classifier_node_metadata_value_filter, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
+    output_child_classifier_nodes (classifier_node_OID + "|", classifier_node_metadata_value, classifier_node_metadata_value_filter, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
 
     // Get the document nodes at this level
@@ -353 +353 @@
   while (hlist_classifier_nodes_iterator != hlist_classifier_nodes.end())
   {
-    text_t hlist_classifier_node_OID = (*hlist_classifier_nodes_iterator).first;
-    if (parent_classifier_node_OID != "")
-    {
-      hlist_classifier_node_OID = parent_classifier_node_OID + "|" + hlist_classifier_node_OID;
-    }
+    text_t hlist_classifier_node_OID = parent_classifier_node_OID + (*hlist_classifier_nodes_iterator).first;
 
     // Is this the hlist node that is currently selected?
@@ -383 +379 @@
 
     // Don't really like messing with this here, but it needs to be done before display_classifier_nodes() below
-    if (args["dcn"] == parent_classifier_node_OID)
+    if (starts_with (parent_classifier_node_OID, args["dcn"]))
     {
       args["dcn"] = selected_hlist_node_OID;
@@ -409 +405 @@
   while (upper_classifier_node_labels_iterator != upper_classifier_node_labels.end())
   {
-    upper_classifier_node_OID += (upper_classifier_node_OID != "" ? "|" : "");
     upper_classifier_node_OID += *upper_classifier_node_labels_iterator;
 
@@ -424 +419 @@
     classifier_node_indent++;
 
+    upper_classifier_node_OID += "|";
     upper_classifier_node_labels_iterator++;
   }
@@ -487 +483 @@
   while (child_classifier_nodes_iterator != child_classifier_nodes.end())
   {
-    text_t child_classifier_node_OID = (*child_classifier_nodes_iterator).first;
-    if (classifier_node_OID != "")
-    {
-      child_classifier_node_OID = classifier_node_OID + "|" + child_classifier_node_OID;
-    }
+    text_t child_classifier_node_OID = classifier_node_OID + (*child_classifier_nodes_iterator).first;
 
     ResultDocInfo_t child_classifier_node;