Changeset 15941

Timestamp:

2008-06-09T17:15:24+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Added a new "metadata value filter" argument to the SQL browse filter requests, in order to support hierarchical dynamic classifiers.

Location:

gsdl/trunk/src

Files:

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

gsdl/trunk/src/colservr/sqlbrowsefilter.cpp

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

gsdl/trunk/src/lib/sqldbclass.h

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

gsdl/trunk/src/lib/sqlitedbclass.cpp

@@ -193 +193 @@
 
 // returns array of values
-text_tarray sqlitedbclass::get_metadata_values (const text_t &metadata_element_name)
+text_tarray sqlitedbclass::get_metadata_values (const text_t &metadata_element_name,
+                        const text_t &metadata_value_filter)
 {
   text_tarray metadata_values;
@@ -205 +206 @@
   // Get the entries in the "document_metadata" table where the element matches that specified
   text_t sql_cmd = "SELECT value FROM document_metadata WHERE element='" + sqlite_safe(metadata_element_name) + "'";
+
+  // Add value filter, if one has been defined
+  if (metadata_value_filter != "")
+  {
+    sql_cmd += " AND value LIKE '" + metadata_value_filter + "'";
+  }
+
   vector<text_tmap> sql_results;
   if (!sqlgetarray(sql_cmd, sql_results) || sql_results.size() == 0)

gsdl/trunk/src/lib/sqlitedbclass.h

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

gsdl/trunk/src/protocol/recptprototools.cpp

@@ -251 +251 @@
 
 
-bool get_metadata_values (const text_t metadata_element_name, const text_t &collection,
-              recptproto *collectproto, FilterResponse_t &response, ostream &logout)
+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)
 {
   response.clear();
@@ -267 +268 @@
   request_option.value = metadata_element_name;
   request.filterOptions.push_back (request_option);
+  request_option.name = "MetadataValueFilter";
+  request_option.value = metadata_value_filter;
+  request.filterOptions.push_back (request_option);
 
   assert (collectproto != NULL);

gsdl/trunk/src/protocol/recptprototools.h

@@ -68 +68 @@
            ostream &logout);
 
-bool get_metadata_values (const text_t metadata_element_name, const text_t &collection,
-              recptproto *collectproto, FilterResponse_t &response, ostream &logout);
+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);
 
 bool get_documents_with_metadata_value (const text_t metadata_element_name, const text_t metadata_value,