Changeset 16057

Timestamp:

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

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Finished restructuring of code.

Location:

gsdl/trunk/src/recpt

Files:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -165 +165 @@
   }
 
-  // Simple case for the top-level nodes
+  // Prepare to output the classifier (and maybe document) nodes
+  text_t classifier_node_OID = args["dcn"];
+  int classifier_node_indent = 0;
+
+  // Simple case at the top level: just output the child classifier nodes
   if (args["dcn"] == selected_grouping_node_OID)
   {
-    text_t classifier_node_OID = args["dcn"];
+    text_t metadata_value_filter = args["dcn"] + "*";
+    output_child_classifier_nodes (classifier_node_OID, metadata_value_filter, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
+  }
+
+  // More complex case below the top level
+  else
+  {
+    // Output the parent classifier nodes
+    output_parent_classifier_nodes (classifier_node_OID, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
+
+    // Display the selected classifier node
+    text_tarray classifier_node_labels;
+    splitchar(classifier_node_OID.begin(), classifier_node_OID.end(), '|', classifier_node_labels);
+    text_t classifier_node_label = classifier_node_labels.back();
+    text_t classifier_node_numleafdocs = "?";
+    display_classifier_node (classifier_node_OID, classifier_node_label, classifier_node_numleafdocs, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
+    classifier_node_indent++;
+
+    // Output the child classifier nodes
+    text_t metadata_value_filter = args["dcn"] + "|*";
+    output_child_classifier_nodes (classifier_node_OID, metadata_value_filter, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
+
+    // Get the document nodes at this level
+    text_t metadata_element_name = classifier_options["metadata_element_name"];
     text_t classifier_node_metadata_value = args["dcn"];
-    int classifier_node_indent = 0;
-    output_top_level_node (classifier_node_OID, classifier_node_metadata_value, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
-  }
-  else
-  {
-    // More complex case for an internal page
-    text_t classifier_node_OID = args["dcn"];
-    text_t classifier_node_metadata_value = args["dcn"];
-    int classifier_node_indent = 0;
-    output_internal_node (classifier_node_OID, classifier_node_metadata_value, classifier_node_indent, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
+    text_t sort_documents_by = classifier_options["-sort_documents_by"];
+    FilterResponse_t documents_response;
+    get_documents_with_metadata_value (metadata_element_name, classifier_node_metadata_value, sort_documents_by, args["c"], collectproto, documents_response, logout);
+
+    // Display the document nodes
+    display_document_nodes (documents_response, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
   }
 
@@ -298 +321 @@
 
 
-void dynamicclassifieraction::output_top_level_node (text_t classifier_node_OID,
-                             text_t classifier_node_metadata_value,
-                             int& classifier_node_indent,
-                             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"];
-  text_t metadata_value_filter = classifier_node_metadata_value + "*";
-  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;
-  }
-
-  // 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);
-
-  // Display the child classifier nodes
-  map<text_t, int, lttext_t>::iterator child_classifier_nodes_iterator = child_classifier_nodes.begin();
-  while (child_classifier_nodes_iterator != child_classifier_nodes.end())
-  {
-    text_t child_classifier_node_OID = (*child_classifier_nodes_iterator).first;
-    if (classifier_node_OID != "")
-    {
-      child_classifier_node_OID = classifier_node_OID + "|" + child_classifier_node_OID;
-    }
-    text_t child_classifier_node_label = (*child_classifier_nodes_iterator).first;
-    int child_classifier_node_numleafdocs = (*child_classifier_nodes_iterator).second;
-    display_classifier_node (child_classifier_node_OID, child_classifier_node_label, child_classifier_node_numleafdocs, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
-    child_classifier_nodes_iterator++;
-  }
-}
-
-
-void dynamicclassifieraction::output_internal_node (text_t classifier_node_OID,
-                            text_t classifier_node_metadata_value,
-                            int& classifier_node_indent,
-                            text_tmap classifier_options, cgiargsclass &args,
-                            recptproto *collectproto, browsermapclass *browsers,
-                            displayclass &disp, outconvertclass &outconvert,
-                            ostream &textout, ostream &logout)
-{
-  // Get all the classifier nodes at this level
-  text_t metadata_element_name = classifier_options["metadata_element_name"];
-  text_t metadata_value_filter = classifier_node_metadata_value + "|*";
-  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;
-  }
-
-  // Get all the documents at this level
-  text_t sort_documents_by = classifier_options["-sort_documents_by"];
-  FilterResponse_t documents_response;
-  get_documents_with_metadata_value (metadata_element_name, classifier_node_metadata_value, sort_documents_by, args["c"], collectproto, documents_response, logout);
-
-  // If there are no classifier nodes or documents at this level then the classifier node value is invalid
-  if (metadata_values_response.docInfo.empty() && documents_response.docInfo.empty())
-  {
-    textout << outconvert << disp << "Error: Invalid classifier node \"" << classifier_node_OID << "\".\n";
-    return;
-  }
-
+void dynamicclassifieraction::output_parent_classifier_nodes (text_t classifier_node_OID,
+                                      int& classifier_node_indent,
+                                  text_tmap classifier_options, cgiargsclass &args,
+                                  recptproto *collectproto, browsermapclass *browsers,
+                                  displayclass &disp, outconvertclass &outconvert,
+                                  ostream &textout, ostream &logout)
+{
   // Determine the parent classifier nodes
   text_tarray 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();
 
@@ -392 +347 @@
     parent_classifier_node_labels_iterator++;
   }
-
-  // Display the selected classifier node
-  int classifier_node_numleafdocs = metadata_values_response.docInfo.size() + documents_response.docInfo.size();
-  display_classifier_node (classifier_node_OID, classifier_node_label, classifier_node_numleafdocs, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
-  classifier_node_indent++;
+}
+
+
+void dynamicclassifieraction::output_child_classifier_nodes (text_t classifier_node_OID,
+                                 text_t metadata_value_filter,
+                                 int& classifier_node_indent,
+                                 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;
+  }
 
   // After processing any hierarchical metadata values, we're left with the child classifer nodes
@@ -405 +377 @@
   while (child_classifier_nodes_iterator != child_classifier_nodes.end())
   {
-    text_t child_classifier_node_OID = classifier_node_OID + "|" + (*child_classifier_nodes_iterator).first;
+    text_t child_classifier_node_OID = (*child_classifier_nodes_iterator).first;
+    if (classifier_node_OID != "")
+    {
+      child_classifier_node_OID = classifier_node_OID + "|" + child_classifier_node_OID;
+    }
     text_t child_classifier_node_label = (*child_classifier_nodes_iterator).first;
     int child_classifier_node_numleafdocs = (*child_classifier_nodes_iterator).second;
@@ -411 +387 @@
     child_classifier_nodes_iterator++;
   }
-
-  // Display the documents at this level
-  display_document_nodes (documents_response, classifier_node_indent, args, collectproto, browsers, disp, outconvert, textout, logout);
 }
 

gsdl/trunk/src/recpt/dynamicclassifieraction.h

@@ -70 +70 @@
                 ostream &textout, ostream &logout);
 
-  void output_top_level_node (text_t classifier_node_OID,
-                  text_t classifier_node_metadata_value,
-                  int& classifier_node_indent,
-                  text_tmap classifier_options, cgiargsclass &args,
-                  recptproto *collectproto, browsermapclass *browsers,
-                  displayclass &disp, outconvertclass &outconvert,
-                  ostream &textout, ostream &logout);
+  void output_parent_classifier_nodes (text_t classifier_node_OID,
+                       int& classifier_node_indent,
+                       text_tmap classifier_options, cgiargsclass &args,
+                       recptproto *collectproto, browsermapclass *browsers,
+                       displayclass &disp, outconvertclass &outconvert,
+                       ostream &textout, ostream &logout);
 
-  void output_internal_node (text_t classifier_node_OID,
-                 text_t classifier_node_metadata_value,
-                 int& classifier_node_indent,
-                 text_tmap classifier_options, cgiargsclass &args,
-                 recptproto *collectproto, browsermapclass *browsers,
-                 displayclass &disp, outconvertclass &outconvert,
-                 ostream &textout, ostream &logout);
+  void output_child_classifier_nodes (text_t classifier_node_OID,
+                      text_t metadata_value_filter,
+                      int& classifier_node_indent,
+                      text_tmap classifier_options, cgiargsclass &args,
+                      recptproto *collectproto, browsermapclass *browsers,
+                      displayclass &disp, outconvertclass &outconvert,
+                      ostream &textout, ostream &logout);
 
   map<text_t, int, lttext_t> process_metadata_values (text_tmap classifier_options,