Changeset 15999

Timestamp:

2008-06-13T14:49:07+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Some modifications in preparation for allowing options to be specified to the dynamic classifiers in the collect.cfg file.

Location:

gsdl/trunk/src/recpt

Files:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -149 +149 @@
   }
 
+  // Parse the classifier options from the specification
+  text_t classifier_specification = cinfo->dynamic_classifiers[arg_dcl];
+  text_tmap classifier_options;
+
+  // The metadata element to classify by should be left after all the options have been parsed off
+  classifier_options["metadata_element_name"] = classifier_specification;
+
   // Output the "<ID>Header" format statement if there is one
   text_t classifier_header_format_statement = "";
-  get_formatstring(arg_dcl + "Header", cinfo->format, classifier_header_format_statement);
+  get_formatstring (arg_dcl + "Header", cinfo->format, classifier_header_format_statement);
   textout << outconvert << disp << classifier_header_format_statement << "\n";
 
   // Output the dynamic classifier
-  text_t metadata_element_name = cinfo->dynamic_classifiers[arg_dcl];
   if (args["dcn"].empty())
   {
     // Simple case for the top-level page
-    output_top_level_page (metadata_element_name, args, collectproto, browsers, disp, outconvert, textout, logout);
+    output_top_level_page (classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
   }
   else
   {
     // More complex case for an internal page
-    output_internal_page (metadata_element_name, args, collectproto, browsers, disp, outconvert, textout, logout);
+    output_internal_page (classifier_options, args, collectproto, browsers, disp, outconvert, textout, logout);
   }
 
   // Output the "<ID>Footer" format statement if there is one
   text_t classifier_footer_format_statement = "";
-  get_formatstring(arg_dcl + "Footer", cinfo->format, classifier_footer_format_statement);
+  get_formatstring (arg_dcl + "Footer", cinfo->format, classifier_footer_format_statement);
   textout << outconvert << disp << classifier_footer_format_statement << "\n";
 
@@ -177 +183 @@
 
 
-void dynamicclassifieraction::output_top_level_page (text_t metadata_element_name, cgiargsclass &args,
+void dynamicclassifieraction::output_top_level_page (text_tmap classifier_options, cgiargsclass &args,
                              recptproto *collectproto, browsermapclass *browsers,
                              displayclass &disp, outconvertclass &outconvert,
@@ -183 +189 @@
 {
   // Get all the metadata values for the specified element (these become the classifier nodes at the top level)
+  text_t metadata_element_name = classifier_options["metadata_element_name"];
   FilterResponse_t metadata_values_response;
   get_metadata_values (metadata_element_name, "", args["c"], collectproto, metadata_values_response, logout);
@@ -225 +232 @@
 
 
-void dynamicclassifieraction::output_internal_page (text_t metadata_element_name, cgiargsclass &args,
+void dynamicclassifieraction::output_internal_page (text_tmap classifier_options, cgiargsclass &args,
                             recptproto *collectproto, browsermapclass *browsers,
                             displayclass &disp, outconvertclass &outconvert,
@@ -236 +243 @@
 
   // 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;

gsdl/trunk/src/recpt/dynamicclassifieraction.h

@@ -63 +63 @@
           ostream &logout);
 
-  void output_top_level_page (text_t metadata_element_name, cgiargsclass &args,
+  void output_top_level_page (text_tmap classifier_options, cgiargsclass &args,
                   recptproto *collectproto, browsermapclass *browsers,
                   displayclass &disp, outconvertclass &outconvert,
                   ostream &textout, ostream &logout);
 
-  void output_internal_page (text_t metadata_element_name, cgiargsclass &args,
+  void output_internal_page (text_tmap classifier_options, cgiargsclass &args,
                  recptproto *collectproto, browsermapclass *browsers,
                  displayclass &disp, outconvertclass &outconvert,