Changeset 16180 for gsdl/trunk/src/protocol/recptprototools.cpp

Timestamp:

2008-06-25T15:38:55+12:00 (16 years ago)

Author:

mdewsnip

Message:

Modifying get_metadata_values() and get_documents_with_metadata_value() to take an array of metadata elements, rather than just one metadata element. This allows building a dynamic classifier on multiple metadata elements.

File:

• gsdl/trunk/src/protocol/recptprototools.cpp (modified) (6 diffs)

gsdl/trunk/src/protocol/recptprototools.cpp

@@ -251 +251 @@
 
 
-bool get_metadata_values (const text_t metadata_element_name, const text_t metadata_value_filter,
+bool get_metadata_values (const text_t metadata_elements, const text_t metadata_value_filter,
               const text_t metadata_value_grouping_expression, const text_t &collection,
               recptproto *collectproto, FilterResponse_t &response, ostream &logout)
@@ -265 +265 @@
 
   OptionValue_t request_option;
-  request_option.name = "MetadataElement";
-  request_option.value = metadata_element_name;
+  request_option.name = "MetadataElements";
+  request_option.value = metadata_elements;
   request.filterOptions.push_back (request_option);
   request_option.name = "MetadataValueFilter";
@@ -281 +281 @@
     outconvertclass text_t2ascii;
     logout << text_t2ascii
-       << "Error: call to filter failed for " << metadata_element_name
+       << "Error: call to filter failed for " << metadata_elements
        << " in recptprototools::get_metadata_values (" 
        << get_comerror_string (err) << ")\n";
@@ -291 +291 @@
 
 
-bool get_documents_with_metadata_value (const text_t metadata_element_name, const text_t metadata_value,
+bool get_documents_with_metadata_value (const text_t metadata_elements, const text_t metadata_value,
                     const text_t sort_by_metadata_element_name, const text_t &collection,
                     recptproto *collectproto, FilterResponse_t &response, ostream &logout)
@@ -305 +305 @@
 
   OptionValue_t request_option;
-  request_option.name = "MetadataElement";
-  request_option.value = metadata_element_name;
+  request_option.name = "MetadataElements";
+  request_option.value = metadata_elements;
   request.filterOptions.push_back (request_option);
   request_option.name = "MetadataValue";
@@ -321 +321 @@
     outconvertclass text_t2ascii;
     logout << text_t2ascii
-       << "Error: call to filter failed for " << metadata_element_name << " = " << metadata_value
+       << "Error: call to filter failed for " << metadata_elements << " = " << metadata_value
        << " in recptprototools::get_documents_with_metadata_value (" 
        << get_comerror_string (err) << ")\n";