Changeset 16196

Timestamp:

2008-06-26T11:03:37+12:00 (16 years ago)

Author:

mdewsnip

Message:

A few variable name and code improvements.

File:

• gsdl/trunk/src/recpt/dynamicclassifieraction.cpp (modified) (1 diff)

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -448 +448 @@
     text_t metadata_value = (*metadata_value_iterator).OID;
 
-    // If we're not at the top-level we need to remove the current position from the metadata values
+    // We need to remove the current position from the metadata value to leave the child metadata value
+    text_t child_metadata_value = metadata_value;
     if (starts_with(metadata_value, classifier_node_metadata_value + "|"))
     {
-      metadata_value = substr(metadata_value.begin() + (classifier_node_metadata_value + "|").size(), metadata_value.end());
-    }
-
-    // Is this metadata value hierarchical?
-    text_t::iterator hierarchy_split_position = findchar(metadata_value.begin(), metadata_value.end(), '|');
-    if (hierarchy_split_position != metadata_value.end())
-    {
-      // Yes, so use the first part of the hierarchy only
-      metadata_value = substr(metadata_value.begin(), hierarchy_split_position);
-    }
-
-    // Create a node for this metadata value if we haven't seen it before
-    if (child_classifier_nodes.find(metadata_value) == child_classifier_nodes.end())
-    {
-      child_classifier_nodes[metadata_value] = 0;
+      child_metadata_value = substr(metadata_value.begin() + (classifier_node_metadata_value + "|").size(), metadata_value.end());
+    }
+
+    // Determine the label for the child classifier node from the metadata value
+    text_tarray child_metadata_value_parts;
+    splitchar (child_metadata_value.begin(), child_metadata_value.end(), '|', child_metadata_value_parts);
+    text_t child_classifier_node_label = child_metadata_value_parts.front();
+
+    // Create a node for this value if we haven't seen it before
+    if (child_classifier_nodes.find(child_classifier_node_label) == child_classifier_nodes.end())
+    {
+      child_classifier_nodes[child_classifier_node_label] = 0;
     }
 
     // Increment the occurrence count
-    child_classifier_nodes[metadata_value] += (*metadata_value_iterator).result_num;
+    child_classifier_nodes[child_classifier_node_label] += (*metadata_value_iterator).result_num;
 
     metadata_value_iterator++;