Changeset 16180 for gsdl/trunk/src/colservr/sqlbrowsefilter.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/colservr/sqlbrowsefilter.cpp (modified) (6 diffs)

gsdl/trunk/src/colservr/sqlbrowsefilter.cpp

@@ -109 +109 @@
   if (request.requestParams == "GetMetadataValues")
   {
-    text_t metadata_element_name = "";
+    text_tarray metadata_element_names;
     text_t metadata_value_filter = "";
     text_t metadata_value_grouping_expression = "";
@@ -115 +115 @@
     while (options_iterator != request.filterOptions.end())
     {
-      if ((*options_iterator).name == "MetadataElement")
-      {
-    metadata_element_name = (*options_iterator).value;
+      if ((*options_iterator).name == "MetadataElements")
+      {
+    splitchar ((*options_iterator).value.begin(), (*options_iterator).value.end(), ',', metadata_element_names);
       }
       if ((*options_iterator).name == "MetadataValueFilter")
@@ -130 +130 @@
     }
 
-    text_tarray metadata_values = sql_db_ptr->get_metadata_values (metadata_element_name, metadata_value_filter, metadata_value_grouping_expression);
+    text_tarray metadata_values = sql_db_ptr->get_metadata_values (metadata_element_names, metadata_value_filter, metadata_value_grouping_expression);
 
     // Create a map from metadata value to ResultDocInfo_t, to remove duplicate values and obtain occurrence counts
@@ -168 +168 @@
   else if (request.requestParams == "GetDocumentsWithMetadataValue")
   {
-    text_t metadata_element_name = "";
+    text_tarray metadata_element_names;
     text_t metadata_value = "";
     text_t sort_by_metadata_element_name = "";
@@ -174 +174 @@
     while (options_iterator != request.filterOptions.end())
     {
-      if ((*options_iterator).name == "MetadataElement")
-      {
-    metadata_element_name = (*options_iterator).value;
+      if ((*options_iterator).name == "MetadataElements")
+      {
+    splitchar ((*options_iterator).value.begin(), (*options_iterator).value.end(), ',', metadata_element_names);
       }
       if ((*options_iterator).name == "MetadataValue")
@@ -189 +189 @@
     }
 
-    text_tarray document_OIDs = sql_db_ptr->get_documents_with_metadata_value (metadata_element_name, metadata_value, sort_by_metadata_element_name);
+    text_tarray document_OIDs = sql_db_ptr->get_documents_with_metadata_value (metadata_element_names, metadata_value, sort_by_metadata_element_name);
 
     // Fill in response.docInfo with the document OIDs