Changeset 15953

Timestamp:

2008-06-10T17:13:04+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) A few more minor code, variable name and comment improvements.

File:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -221 +221 @@
 {
   text_t arg_dcn = args["dcn"];
+  text_t classifier_node_OID = arg_dcn;
   text_t classifier_node_metadata_value = arg_dcn;
   int node_indent = 0;
@@ -242 +243 @@
   // Determine the parent classifier nodes
   text_tarray parent_classifier_node_labels;
-  splitchar(classifier_node_metadata_value.begin(), classifier_node_metadata_value.end(), '|', parent_classifier_node_labels);
+  splitchar(classifier_node_OID.begin(), classifier_node_OID.end(), '|', parent_classifier_node_labels);
+  text_t classifier_node_label = parent_classifier_node_labels.back();
+  parent_classifier_node_labels.pop_back();
 
   // Display the parent classifier nodes
@@ -259 +262 @@
   }
 
+  // Display the selected classifier node
+  int classifier_node_numleafdocs = metadata_values_response.docInfo.size() + document_OIDs_response.docInfo.size();
+  output_classifier_node (classifier_node_OID, classifier_node_label, classifier_node_numleafdocs, node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
+  node_indent++;
+
   // Determine the child classifier nodes
   map<text_t, int, lttext_t> child_classifier_nodes;
@@ -266 +274 @@
     text_t metadata_value = (*metadata_value_iterator).OID;
 
+    // If the classifier is hierarchical we need to remove the current position from the metadata value
     if (starts_with(metadata_value, arg_dcn + "|"))
     {
@@ -295 +304 @@
   while (child_classifier_nodes_iterator != child_classifier_nodes.end())
   {
-    text_t child_classifier_node_OID = parent_classifier_node_OID + "|" + (*child_classifier_nodes_iterator).first;
+    text_t child_classifier_node_OID = classifier_node_OID + "|" + (*child_classifier_nodes_iterator).first;
     text_t child_classifier_node_label = (*child_classifier_nodes_iterator).first;
     int child_classifier_node_numleafdocs = (*child_classifier_nodes_iterator).second;