Changeset 15940

Timestamp:

2008-06-09T17:05:32+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Starting to add support for hierarchical values (currently incomplete).

File:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -173 +173 @@
     get_metadata_values (metadata_element_name, args["c"], collectproto, metadata_values_response, logout);
 
-    // Add metadata necessary for output_section_group() to display the results as classifier nodes
+    // Deal with hierarchical metadata values
+    map<text_t, int, lttext_t> classifier_nodes;
     ResultDocInfo_tarray::iterator metadata_value_iterator = metadata_values_response.docInfo.begin();
     while (metadata_value_iterator != metadata_values_response.docInfo.end())
     {
-      (*metadata_value_iterator).metadata["doctype"].values.push_back("classify");
-      (*metadata_value_iterator).metadata["haschildren"].values.push_back("1");
-      (*metadata_value_iterator).metadata["numleafdocs"].values.push_back((*metadata_value_iterator).result_num);
-      (*metadata_value_iterator).metadata["Title"].values.push_back((*metadata_value_iterator).OID);
+      text_t metadata_value = (*metadata_value_iterator).OID;
+
+      // 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 split off the first part of the hierarchy for the classifier node
+    metadata_value = substr(metadata_value.begin(), hierarchy_split_position);
+      }
+
+      // Create a node for this metadata value if we haven't seen it before
+      if (classifier_nodes.find(metadata_value) == classifier_nodes.end())
+      {
+    classifier_nodes[metadata_value] = 0;
+      }
+
+      // Increment the occurrence count
+      classifier_nodes[metadata_value] += (*metadata_value_iterator).result_num;
+
       metadata_value_iterator++;
     }
 
+    // Create the structure containing the classifer nodes to pass to output_section_group(), with the right info
+    FilterResponse_t classifier_nodes_response;
+    map<text_t, int, lttext_t>::iterator classifier_nodes_iterator = classifier_nodes.begin();
+    while (classifier_nodes_iterator != classifier_nodes.end())
+    {
+      ResultDocInfo_t classifier_node;
+      classifier_node.OID = (*classifier_nodes_iterator).first;
+
+      // Add metadata necessary for output_section_group() to display the results as classifier nodes
+      classifier_node.metadata["doctype"].values.push_back ("classify");
+      classifier_node.metadata["haschildren"].values.push_back ("1");
+      classifier_node.metadata["numleafdocs"].values.push_back ((*classifier_nodes_iterator).second);
+      classifier_node.metadata["Title"].values.push_back ((*classifier_nodes_iterator).first);
+
+      classifier_nodes_response.docInfo.push_back (classifier_node);
+      classifier_nodes_iterator++;
+    }
+
     // Display the classifier nodes
-    bptr->output_section_group (metadata_values_response, args, args["c"], 0, formatlistptr, use_table, metadata, getParents, collectproto, disp, outconvert, textout, logout);
+    bptr->output_section_group (classifier_nodes_response, args, args["c"], 0, formatlistptr, use_table, metadata, getParents, collectproto, disp, outconvert, textout, logout);
   }
   else