Changeset 15764 for gsdl/trunk/src/colservr/sqlbrowsefilter.cpp

Timestamp:

2008-05-28T16:16:17+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Updated the FRmetadataValues request code to a) remove all duplicate metadata values, b) set an occurrence count on the metadata values, and c) return the metadata values sorted.

File:

• gsdl/trunk/src/colservr/sqlbrowsefilter.cpp (modified) (1 diff)

gsdl/trunk/src/colservr/sqlbrowsefilter.cpp

@@ -111 +111 @@
   }
 
+  // Request for the metadata values assigned to an element
   if ((request.filterResultOptions & FRmetadataValues) && !request.fields.empty())
   {
     text_t metadata_element_name = *(request.fields.begin());
-    logout << text_t2ascii << "Requesting metadata values for " << metadata_element_name << "...\n";
     text_tarray metadata_values = sql_db_ptr->getmetadatavalues (metadata_element_name);
+
+    // Create a map from metadata value to ResultDocInfo_t, to remove duplicate values and obtain occurrence counts
+    map<text_t, ResultDocInfo_t> unique_metadata_values_map;
     text_tarray::iterator metadata_value_iterator = metadata_values.begin();
     while (metadata_value_iterator != metadata_values.end())
     {
-      ResultDocInfo_t metadata_value_result_doc;
-      metadata_value_result_doc.OID = *metadata_value_iterator;
-      response.docInfo.push_back (metadata_value_result_doc);
+      text_t metadata_value = *metadata_value_iterator;
+
+      // If no ResultDocInfo_t has already been created for this metadata value, create one now
+      if (unique_metadata_values_map.find(metadata_value) == unique_metadata_values_map.end())
+      {
+    ResultDocInfo_t metadata_value_result_doc;
+    metadata_value_result_doc.OID = metadata_value;
+    metadata_value_result_doc.result_num = 1;
+    unique_metadata_values_map[metadata_value] = metadata_value_result_doc;
+      }
+      // Otherwise we've seen this value before, so just update the occurrence count
+      else
+      {
+    unique_metadata_values_map[metadata_value].result_num++;
+      }
 
       metadata_value_iterator++;
+    }
+
+    // Fill in response.docInfo with the ResultDocInfo_t objects we've created above
+    map<text_t, ResultDocInfo_t>::iterator unique_metadata_values_iterator = unique_metadata_values_map.begin();
+    while (unique_metadata_values_iterator != unique_metadata_values_map.end())
+    {
+      response.docInfo.push_back ((*unique_metadata_values_iterator).second);
+      unique_metadata_values_iterator++;
     }
   }