Changeset 16054

Timestamp:

2008-06-18T15:47:16+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) More work in preparation for merging output_top_level_node() and output_internal_node().

Location:

gsdl/trunk/src/recpt

Files:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -168 +168 @@
   if (args["dcn"] == selected_grouping_node_OID)
   {
-    text_t classifier_node_OID = selected_grouping_node_OID;
-    text_t metadata_value_filter = selected_grouping_node_OID + "*";
-    output_top_level_nodes (classifier_node_OID, metadata_value_filter, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
+    text_t classifier_node_OID = args["dcn"];
+    text_t classifier_node_metadata_value = args["dcn"];
+    output_top_level_node (classifier_node_OID, classifier_node_metadata_value, classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
   }
   else
@@ -296 +296 @@
 
 
-void dynamicclassifieraction::output_top_level_nodes (text_t classifier_node_OID, 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 (these become the classifier nodes at the top level)
+void dynamicclassifieraction::output_top_level_node (text_t classifier_node_OID,
+                             text_t classifier_node_metadata_value,
+                             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);

gsdl/trunk/src/recpt/dynamicclassifieraction.h

@@ -70 +70 @@
                 ostream &textout, ostream &logout);
 
-  void output_top_level_nodes (text_t classifier_node_OID, 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_top_level_node (text_t classifier_node_OID,
+                  text_t classifier_node_metadata_value,
+                  text_tmap classifier_options, cgiargsclass &args,
+                  recptproto *collectproto, browsermapclass *browsers,
+                  displayclass &disp, outconvertclass &outconvert,
+                  ostream &textout, ostream &logout);
 
-  void output_internal_page (text_tmap classifier_options, cgiargsclass &args,
+  void output_internal_node (text_t classifier_node_OID,
+                 text_t classifier_node_metadata_value,
+                 text_tmap classifier_options, cgiargsclass &args,
                  recptproto *collectproto, browsermapclass *browsers,
                  displayclass &disp, outconvertclass &outconvert,