Changeset 16181

Timestamp:

2008-06-25T15:45:41+12:00 (16 years ago)

Author:

mdewsnip

Message:

Changed a few variable names and comments now that multiple metadata elements are allowed.

File:

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

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -231 +231 @@
 
     // Get the document nodes at this level
-    text_t metadata_element_name = classifier_options["metadata_element_name"];
+    text_t metadata_elements = classifier_options["metadata_elements"];
     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);
+    get_documents_with_metadata_value (metadata_elements, classifier_node_metadata_value, sort_documents_by, args["c"], collectproto, documents_response, logout);
 
     // Display the document nodes
@@ -258 +258 @@
   splitchar (classifier_specification.begin(), classifier_specification.end(), ' ', classifier_specification_parts);
 
-  // The metadata element to classify by should be the first value
-  classifier_options["metadata_element_name"] = classifier_specification_parts.front();
+  // The metadata element(s) to classify by should be the first value
+  classifier_options["metadata_elements"] = classifier_specification_parts.front();
   classifier_specification_parts.pop_front();
 
@@ -293 +293 @@
                                    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"];
+  // Get all the metadata values for the specified element(s) that match the filter
+  text_t metadata_elements = classifier_options["metadata_elements"];
   FilterResponse_t metadata_values_response;
-  bool request_success = get_metadata_values (metadata_element_name, metadata_value_filter, metadata_value_grouping_expression, args["c"], collectproto, metadata_values_response, logout);
+  bool request_success = get_metadata_values (metadata_elements, metadata_value_filter, metadata_value_grouping_expression, args["c"], collectproto, metadata_values_response, logout);
 
   // If the request failed then it's probably because the collection isn't using an SQL infodbtype
@@ -429 +429 @@
                                  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"];
+  // Get all the metadata values for the specified element(s) that match the filter
+  text_t metadata_elements = classifier_options["metadata_elements"];
   FilterResponse_t metadata_values_response;
-  bool request_success = get_metadata_values (metadata_element_name, metadata_value_filter, "", args["c"], collectproto, metadata_values_response, logout);
+  bool request_success = get_metadata_values (metadata_elements, 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