tracker r2863 - in trunk: . src/libtracker-data

[mottela svn gnome org]

Author: mottela
Date: Thu Jan 29 20:24:24 2009
New Revision: 2863
URL: http://svn.gnome.org/viewvc/tracker?rev=2863&view=rev

Log:
Fixed filtering for multiple tags

Modified:
   trunk/ChangeLog
   trunk/src/libtracker-data/tracker-rdf-query.c

Modified: trunk/src/libtracker-data/tracker-rdf-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-rdf-query.c	(original)
+++ trunk/src/libtracker-data/tracker-rdf-query.c	Thu Jan 29 20:24:24 2009
@@ -1228,7 +1228,6 @@
 		GHashTable *table = NULL;
 		GHashTableIter iter;
 		GList *list = NULL;
-		guint count = 0;
 		gchar *key;
 
 		table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
@@ -1265,26 +1264,14 @@
 			gchar *keyword_metadata;
 
 			keyword_metadata = tracker_data_schema_metadata_field_get_related_names (iface, key);
-			g_string_append_printf (data.sql_where,
-						" AND (S.ID IN (SELECT ServiceID FROM ServiceKeywordMetaData WHERE MetaDataID in (%s) AND ( ",
-						keyword_metadata);
 
-
-			count = 0;
 			for (l = list; l; l = l->next) {
-				if (count) {
-					g_string_append_printf (data.sql_where,
-								" OR ");
-				}
-				count++;
 				g_string_append_printf (data.sql_where,
-				    " (MetadataValue = '%s') ",
+				     " AND (S.ID IN (SELECT ServiceID FROM ServiceKeywordMetaData WHERE MetaDataID in (%s) AND MetadataValue = '%s')) ",
+							keyword_metadata,
 							(gchar*) l->data);
 			}
 
-			g_string_append_printf (data.sql_where,
-						" ))) ");
-
 			g_list_foreach(list, (GFunc)g_free, NULL);
 			g_list_free (list);
 			g_free (keyword_metadata);