Changeset 16039

Timestamp:

2008-06-17T15:59:02+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Added a new "metadata_value_grouping_expression" parameter to the "get_metadata_values" SQL function, in preparation for adding grouping node support.

Location:

gsdl/trunk/src

Files:

• colservr/sqlbrowsefilter.cpp (modified) (2 diffs)
• lib/sqldbclass.h (modified) (1 diff)
• lib/sqlitedbclass.cpp (modified) (1 diff)
• lib/sqlitedbclass.h (modified) (1 diff)
• protocol/recptprototools.cpp (modified) (2 diffs)
• protocol/recptprototools.h (modified) (1 diff)
• recpt/dynamicclassifieraction.cpp (modified) (2 diffs)

gsdl/trunk/src/colservr/sqlbrowsefilter.cpp

@@ -111 +111 @@
     text_t metadata_element_name = "";
     text_t metadata_value_filter = "";
+    text_t metadata_value_grouping_expression = "";
     OptionValue_tarray::const_iterator options_iterator = request.filterOptions.begin();
     while (options_iterator != request.filterOptions.end())
@@ -122 +123 @@
     metadata_value_filter = (*options_iterator).value;
       }
+      if ((*options_iterator).name == "MetadataValueGroupExpression")
+      {
+    metadata_value_grouping_expression = (*options_iterator).value;
+      }
       options_iterator++;
     }
 
-    text_tarray metadata_values = sql_db_ptr->get_metadata_values (metadata_element_name, metadata_value_filter);
+    text_tarray metadata_values = sql_db_ptr->get_metadata_values (metadata_element_name, metadata_value_filter, metadata_value_grouping_expression);
 
     // Create a map from metadata value to ResultDocInfo_t, to remove duplicate values and obtain occurrence counts

gsdl/trunk/src/lib/sqldbclass.h

@@ -49 +49 @@
   // returns array of values
   virtual text_tarray get_metadata_values (const text_t &metadata_element_name,
-                       const text_t &metadata_value_filter) = 0;
+                       const text_t &metadata_value_filter,
+                       const text_t &metadata_value_grouping_expression) = 0;
 };
 

gsdl/trunk/src/lib/sqlitedbclass.cpp

@@ -191 +191 @@
 // returns array of values
 text_tarray sqlitedbclass::get_metadata_values (const text_t &metadata_element_name,
-                        const text_t &metadata_value_filter)
+                        const text_t &metadata_value_filter,
+                        const text_t &metadata_value_grouping_expression)
 {
   text_tarray metadata_values;

gsdl/trunk/src/lib/sqlitedbclass.h

@@ -61 +61 @@
   // returns array of values
   text_tarray get_metadata_values (const text_t &metadata_element_name,
-                   const text_t &metadata_value_filter);
+                   const text_t &metadata_value_filter,
+                   const text_t &metadata_value_grouping_expression);
 
   // returns true on success

gsdl/trunk/src/protocol/recptprototools.cpp

@@ -252 +252 @@
 
 bool get_metadata_values (const text_t metadata_element_name, const text_t metadata_value_filter,
-              const text_t &collection, recptproto *collectproto,
-              FilterResponse_t &response, ostream &logout)
+              const text_t metadata_value_grouping_expression, const text_t &collection,
+              recptproto *collectproto, FilterResponse_t &response, ostream &logout)
 {
   response.clear();
@@ -271 +271 @@
   request_option.value = metadata_value_filter;
   request.filterOptions.push_back (request_option);
+  request_option.name = "MetadataValueGroupingExpression";
+  request_option.value = metadata_value_grouping_expression;
+  request.filterOptions.push_back (request_option);
 
   assert (collectproto != NULL);

gsdl/trunk/src/protocol/recptprototools.h

@@ -69 +69 @@
 
 bool get_metadata_values (const text_t metadata_element_name, const text_t metadata_value_filter,
-              const text_t &collection, recptproto *collectproto,
-              FilterResponse_t &response, ostream &logout);
+              const text_t metadata_value_grouping_expression, const text_t &collection,
+              recptproto *collectproto, FilterResponse_t &response, ostream &logout);
 
 bool get_documents_with_metadata_value (const text_t metadata_element_name, const text_t metadata_value,

gsdl/trunk/src/recpt/dynamicclassifieraction.cpp

@@ -224 +224 @@
   text_t metadata_element_name = classifier_options["metadata_element_name"];
   FilterResponse_t metadata_values_response;
-  bool request_success = get_metadata_values (metadata_element_name, "", args["c"], collectproto, metadata_values_response, logout);
+  bool request_success = get_metadata_values (metadata_element_name, "", "", args["c"], collectproto, metadata_values_response, logout);
 
   // If the request failed then it's probably because the collection isn't using an SQL infodbtype
@@ -262 +262 @@
   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);
+  bool request_success = get_metadata_values (metadata_element_name, 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