Changeset 16058 for gsdl

Timestamp:

2008-06-18T17:11:11+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Merged process_metadata_values() into output_child_classifier_nodes() because this is the only place it is used.

Location:

gsdl/trunk/src/recpt

Files:

• dynamicclassifieraction.cpp (modified) (2 diffs)
• dynamicclassifieraction.h (modified) (1 diff)

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -370 +370 @@
   }
 
-  // After processing any hierarchical metadata values, we're left with the child classifer nodes
-  map<text_t, int, lttext_t> child_classifier_nodes = process_metadata_values (classifier_options, metadata_values_response.docInfo);
+  // After processing any hierarchical metadata values we're left with the child classifer nodes
+  map<text_t, int, lttext_t> child_classifier_nodes;
+  text_t current_position = args["dcn"];
+  ResultDocInfo_tarray::iterator metadata_value_iterator = metadata_values_response.docInfo.begin();
+  while (metadata_value_iterator != metadata_values_response.docInfo.end())
+  {
+    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
+    if (current_position != "" && starts_with(metadata_value, current_position + "|"))
+    {
+      metadata_value = substr(metadata_value.begin() + (current_position + "|").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;
+    }
+
+    // Increment the occurrence count
+    child_classifier_nodes[metadata_value] += (*metadata_value_iterator).result_num;
+
+    metadata_value_iterator++;
+  }
 
   // Display the child classifier nodes
@@ -387 +418 @@
     child_classifier_nodes_iterator++;
   }
-}
-
-
-map<text_t, int, lttext_t> dynamicclassifieraction::process_metadata_values (text_tmap classifier_options,
-                                         ResultDocInfo_tarray metadata_values)
-{
-  map<text_t, int, lttext_t> metadata_values_grouped;
-
-  text_t current_position = classifier_options["current_position"];
-  ResultDocInfo_tarray::iterator metadata_value_iterator = metadata_values.begin();
-  while (metadata_value_iterator != metadata_values.end())
-  {
-    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
-    if (current_position != "" && starts_with(metadata_value, current_position + "|"))
-    {
-      metadata_value = substr(metadata_value.begin() + (current_position + "|").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 (metadata_values_grouped.find(metadata_value) == metadata_values_grouped.end())
-    {
-      metadata_values_grouped[metadata_value] = 0;
-    }
-
-    // Increment the occurrence count
-    metadata_values_grouped[metadata_value] += (*metadata_value_iterator).result_num;
-
-    metadata_value_iterator++;
-  }
-
-  return metadata_values_grouped;
 }
 

gsdl/trunk/src/recpt/dynamicclassifieraction.h

@@ -85 +85 @@
                       ostream &textout, ostream &logout);
 
-  map<text_t, int, lttext_t> process_metadata_values (text_tmap classifier_options,
-                              ResultDocInfo_tarray metadata_values);
-
   void display_classifier_node (text_t classifier_node_OID, text_t classifier_node_label,
                 text_t classifier_node_numleafdocs, int classifier_node_indent,