Changeset 16041

Timestamp:

2008-06-17T17:09:38+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Adding dynamic classifiers) Implemented the necessary code for the metadata value grouping expression.

File:

• gsdl/trunk/src/lib/sqlitedbclass.cpp (modified) (3 diffs)

gsdl/trunk/src/lib/sqlitedbclass.cpp

@@ -202 +202 @@
   }
 
+  // Get the raw "value" field unless a grouping expression was provided (in this case an edited value is returned)
+  text_t value_select_expression = "value";
+  if (metadata_value_grouping_expression != "")
+  {
+    value_select_expression = metadata_value_grouping_expression;
+  }
+
   // Get the entries in the "document_metadata" table where the element matches that specified
-  text_t sql_cmd = "SELECT DISTINCT docOID,value FROM document_metadata WHERE element='" + sqlite_safe(metadata_element_name) + "'";
+  text_t sql_cmd = "SELECT DISTINCT docOID," + value_select_expression + " FROM document_metadata WHERE element='" + sqlite_safe(metadata_element_name) + "'";
 
   // Add value filter, if one has been defined
@@ -211 +218 @@
   }
 
+  // Perform the SQL request
   vector<text_tmap> sql_results;
   if (!sqlgetarray(sql_cmd, sql_results) || sql_results.size() == 0)
@@ -222 +230 @@
   {
     text_tmap sql_result = (*sql_results_iterator);
-    metadata_values.push_back(sql_result["value"]);
+    metadata_values.push_back(sql_result[value_select_expression]);
     sql_results_iterator++;
   }