Changeset 15802

Timestamp:

2008-05-29T15:48:58+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Changing the way information is stored in FilterRequest_t objects for the sqlbrowsefilter requests.

Location:

gsdl/trunk/src

Files:

• colservr/comtypes.h (modified) (1 diff)
• colservr/sqlbrowsefilter.cpp (modified) (1 diff)
• protocol/recptprototools.cpp (modified) (1 diff)

gsdl/trunk/src/colservr/comtypes.h

@@ -241 +241 @@
 // used to indicate a full text browse query for mgpp
 #define FRfullTextBrowse  128
-#define FRmetadataValues  256
 
 struct FilterRequest_t {

gsdl/trunk/src/colservr/sqlbrowsefilter.cpp

@@ -107 +107 @@
 
   // Request for the metadata values assigned to an element
-  if ((request.filterResultOptions & FRmetadataValues) && !request.fields.empty())
+  if (request.requestParams == "GetMetadataValues")
   {
-    text_t metadata_element_name = *(request.fields.begin());
+    text_t metadata_element_name = "";
+    OptionValue_tarray::const_iterator options_iterator = request.filterOptions.begin();
+    while (options_iterator != request.filterOptions.end())
+    {
+      if ((*options_iterator).name == "MetadataElement")
+      {
+    metadata_element_name = (*options_iterator).value;
+      }
+      options_iterator++;
+    }
+
     text_tarray metadata_values = sql_db_ptr->get_metadata_values (metadata_element_name);
 

gsdl/trunk/src/protocol/recptprototools.cpp

@@ -261 +261 @@
 
   request.filterName = "SQLBrowseFilter";
-  request.filterResultOptions = FRmetadataValues;
-  request.fields.insert (metadata_element);
+  request.requestParams = "GetMetadataValues";
+
+  OptionValue_t request_option;
+  request_option.name = "MetadataElement";
+  request_option.value = metadata_element;
+  request.filterOptions.push_back (request_option);
+
   assert (collectproto != NULL);
-
   collectproto->filter (collection, request, response, err, logout);
   if (err != noError)