Changeset 16114

Timestamp:

2008-06-24T12:50:27+12:00 (16 years ago)

Author:

mdewsnip

Message:

Adding initial support for a "-use_hlist_at_top" option. Code tidying up to come.

Location:

gsdl/trunk/src/recpt

Files:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -173 +173 @@
   }
 
-  // Output the dynamic classifier, beginning with the (optional) grouping nodes
+  // Prepare to output the dynamic classifier
+  text_t classifier_node_OID = args["dcn"];
+  int classifier_node_indent = 0;
+
+  // Begin with the (optional) grouping nodes
   text_t selected_grouping_node_OID = "";
   if (!classifier_options["-group_using"].empty())
   {
     selected_grouping_node_OID = output_grouping_nodes (classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
-  }
-  text_t classifier_node_OID = args["dcn"];  // args["dcn"] may have been modified by output_grouping_nodes()
-  int classifier_node_indent = 0;
+    classifier_node_OID = args["dcn"];  // args["dcn"] may have been modified by output_grouping_nodes()
+  }
+
+  // Next, optionally display an hlist level
+  text_t selected_hlist_node_OID = "";
+  if (classifier_options["-use_hlist_at_top"] == "1")
+  {
+    text_t parent_classifier_node_OID = selected_grouping_node_OID;
+    text_t classifier_node_metadata_value = selected_grouping_node_OID;
+    text_t metadata_value_filter = selected_grouping_node_OID + "*";
+    selected_hlist_node_OID = output_hlist_classifier_nodes (parent_classifier_node_OID, classifier_node_metadata_value, metadata_value_filter, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
+    classifier_node_OID = args["dcn"];  // args["dcn"] may have been modified by output_hlist_classifier_nodes()
+  }
 
   // Simple case at the top level: just output the child classifier nodes
@@ -199 +213 @@
     }
 
+    // This is the classifier node OID without any hlist nodes
+    text_t classifier_node_OID_sans_hlists = classifier_node_OID;
+    if (classifier_node_OID == selected_hlist_node_OID)
+    {
+      classifier_node_OID_sans_hlists = "";
+    }
+    else if (starts_with (classifier_node_OID, selected_hlist_node_OID + "|"))
+    {
+      classifier_node_OID_sans_hlists = substr (classifier_node_OID.begin() + (selected_hlist_node_OID + "|").size(), classifier_node_OID.end());
+    }
+
     // Determine the parent classifier node labels
     text_tlist parent_classifier_node_labels;
-    splitchar(classifier_node_OID_sans_grouping.begin(), classifier_node_OID_sans_grouping.end(), '|', parent_classifier_node_labels);
+    splitchar(classifier_node_OID_sans_hlists.begin(), classifier_node_OID_sans_hlists.end(), '|', parent_classifier_node_labels);
 
     // Output the parent classifier nodes and the current classifier node
-    output_upper_classifier_nodes (selected_grouping_node_OID, parent_classifier_node_labels, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
+    output_upper_classifier_nodes (selected_hlist_node_OID, parent_classifier_node_labels, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
 
     // Output the child classifier nodes
@@ -319 +344 @@
 
   return selected_grouping_node_OID;
+}
+
+
+text_t dynamicclassifieraction::output_hlist_classifier_nodes (text_t parent_classifier_node_OID,
+                                   text_t classifier_node_metadata_value,
+                                   text_t metadata_value_filter,
+                                   text_tmap classifier_options, cgiargsclass &args,
+                                   recptproto *collectproto, browsermapclass *browsers,
+                                   displayclass &disp, outconvertclass &outconvert,
+                                   ostream &textout, ostream &logout)
+{
+  // Get all the metadata values for the specified element that match the filter
+  text_t metadata_element_name = classifier_options["metadata_element_name"];
+  FilterResponse_t metadata_values_response;
+  bool request_success = get_metadata_values (metadata_element_name, metadata_value_filter, "", args["c"], collectproto, metadata_values_response, logout);
+
+  // If the request failed then it's probably because the collection isn't using an SQL infodbtype
+  if (request_success == false)
+  {
+    textout << outconvert << disp << "Error: Dynamic classifier functionality is not available. Please check you are using an SQL infodbtype and the collection has been rebuilt.\n";
+    return "";
+  }
+
+  // Check some metadata values were returned
+  if (metadata_values_response.docInfo.empty())
+  {
+    return "";
+  }
+
+  // After processing any hierarchical metadata values we're left with the hlist classifer nodes
+  map<text_t, int, lttext_t> hlist_classifier_nodes;
+  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 (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 (hlist_classifier_nodes.find(metadata_value) == hlist_classifier_nodes.end())
+    {
+      hlist_classifier_nodes[metadata_value] = 0;
+    }
+
+    // Increment the occurrence count
+    hlist_classifier_nodes[metadata_value] += (*metadata_value_iterator).result_num;
+
+    metadata_value_iterator++;
+  }
+
+  // If no classifier node has been specified automatically go to the first hlist node
+  if (args["dcn"] == parent_classifier_node_OID)
+  {
+    args["dcn"] = (*hlist_classifier_nodes.begin()).first;
+  }
+
+  // Add the necessary metadata to the hlist classifier nodes
+  text_t selected_hlist_node_OID = "";
+  FilterResponse_t hlist_classifier_nodes_response;
+  map<text_t, int, lttext_t>::iterator hlist_classifier_nodes_iterator = hlist_classifier_nodes.begin();
+  while (hlist_classifier_nodes_iterator != hlist_classifier_nodes.end())
+  {
+    text_t hlist_classifier_node_OID = (*hlist_classifier_nodes_iterator).first;
+
+    // Is this the hlist node that is currently selected?
+    if (starts_with (args["dcn"], hlist_classifier_node_OID))
+    {
+      selected_hlist_node_OID = hlist_classifier_node_OID;
+    }
+
+    // Add the necessary metadata required to display the hlist nodes correctly
+    ResultDocInfo_t hlist_classifier_node;
+    hlist_classifier_node.OID = hlist_classifier_node_OID;
+    hlist_classifier_node.metadata["doctype"].values.push_back ("classify");
+    hlist_classifier_node.metadata["haschildren"].values.push_back ("1");
+    hlist_classifier_node.metadata["numleafdocs"].values.push_back ("?");  // We can't determine this without more database requests
+    hlist_classifier_node.metadata["Title"].values.push_back (hlist_classifier_node_OID);
+    hlist_classifier_nodes_response.docInfo.push_back (hlist_classifier_node);
+
+    hlist_classifier_nodes_iterator++;
+  }
+
+  // Display the hlist nodes
+  display_classifier_nodes (hlist_classifier_nodes_response, "HList", 0, args, collectproto, browsers, disp, outconvert, textout, logout);
+
+  return selected_hlist_node_OID;
 }
 

gsdl/trunk/src/recpt/dynamicclassifieraction.h

@@ -70 +70 @@
                 ostream &textout, ostream &logout);
 
+  text_t output_hlist_classifier_nodes (text_t parent_classifier_node_OID,
+                    text_t classifier_node_metadata_value,
+                    text_t metadata_value_filter,
+                    text_tmap classifier_options, cgiargsclass &args,
+                    recptproto *collectproto, browsermapclass *browsers,
+                    displayclass &disp, outconvertclass &outconvert,
+                    ostream &textout, ostream &logout);
+
   void output_upper_classifier_nodes (text_t root_classifier_node_OID,
                       text_tlist parent_classifier_node_labels,