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

[mottela svn gnome org]

Author: mottela
Date: Wed Mar 25 16:41:31 2009
New Revision: 3136
URL: http://svn.gnome.org/viewvc/tracker?rev=3136&view=rev

Log:
Fixed a missing condition for join in queries

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

Modified: trunk/src/libtracker-data/tracker-data-schema.c
==============================================================================
--- trunk/src/libtracker-data/tracker-data-schema.c	(original)
+++ trunk/src/libtracker-data/tracker-data-schema.c	Wed Mar 25 16:41:31 2009
@@ -230,14 +230,14 @@
 
 		key_collate = tracker_ontology_service_get_key_metadata (service, field_name);
 
-		if (key_collate > 0 && key_collate < 6) {
+		if (key_collate > 0 && key_collate <= 5) {
 			gchar *str;
 
 			str = g_strdup_printf (" S.KeyMetadataCollation%d", key_collate);
 			tracker_field_data_set_order_field (field_data, str);
 			tracker_field_data_set_needs_collate (field_data, FALSE);
 			g_free (str);
-		} else if (key_collate > 5 && key_collate < 9) {
+		} else if (key_collate >= 6 && key_collate <= 8) {
 			gchar *str;
 			
 			str = g_strdup_printf (" S.KeyMetadata%d", key_collate);

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	Wed Mar 25 16:41:31 2009
@@ -428,6 +428,10 @@
 								tracker_field_data_get_select_field (field_data));
 				}
 			}
+
+			if (is_order) {
+				tracker_field_data_set_is_order (field_data, TRUE);
+			}
 		}
 	}