tracker r1615 - in branches/xesam-support: . src/libtracker-db src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Tue Jun 10 09:06:16 2008
New Revision: 1615
URL: http://svn.gnome.org/viewvc/tracker?rev=1615&view=rev

Log:
2008-06-10  Philip Van Hoof  <pvanhoof gnome org>

        * src/trackerd/tracker-xesam-live-search.c:
        * src/trackerd/tracker-db.c:
        * src/libtracker-db/tracker-db-manager.c:

        Fixed the ATTACH statements in tracker-db-manager.c
        Fixed an invalid assertion on fields for
        tracker_db_live_search_get_hit_data



Modified:
   branches/xesam-support/ChangeLog
   branches/xesam-support/src/libtracker-db/tracker-db-manager.c
   branches/xesam-support/src/trackerd/tracker-db.c
   branches/xesam-support/src/trackerd/tracker-xesam-live-search.c

Modified: branches/xesam-support/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- branches/xesam-support/src/libtracker-db/tracker-db-manager.c	(original)
+++ branches/xesam-support/src/libtracker-db/tracker-db-manager.c	Tue Jun 10 09:06:16 2008
@@ -1799,6 +1799,22 @@
 		db_exec_no_reply (iface, "ANALYZE");
 	}
 
+	db_exec_no_reply (iface,
+			  "ATTACH '%s' as 'file-meta'",
+			  tracker_db_manager_get_file (TRACKER_DB_FILE_METADATA));
+
+	db_exec_no_reply (iface,
+			  "ATTACH '%s' as 'email-meta'",
+			  tracker_db_manager_get_file (TRACKER_DB_EMAIL_METADATA));
+
+	db_exec_no_reply (iface,
+			  "ATTACH '%s' as 'common'",
+			  tracker_db_manager_get_file (TRACKER_DB_COMMON));
+
+	db_exec_no_reply (iface,
+			  "ATTACH '%s' as 'cache'",
+			  tracker_db_manager_get_file (TRACKER_DB_CACHE));
+
 	return iface;
 }
 

Modified: branches/xesam-support/src/trackerd/tracker-db.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-db.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-db.c	Tue Jun 10 09:06:16 2008
@@ -2339,7 +2339,7 @@
 
 	g_return_val_if_fail (TRACKER_IS_DB_INTERFACE (iface), NULL);
 	g_return_val_if_fail (search_id != NULL, NULL);
-	g_return_val_if_fail (fields != NULL, NULL);
+	//g_return_val_if_fail (fields != NULL, NULL);
 
 	sql_select = g_string_new ("");
 	sql_join = g_string_new ("");

Modified: branches/xesam-support/src/trackerd/tracker-xesam-live-search.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-xesam-live-search.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-xesam-live-search.c	Tue Jun 10 09:06:16 2008
@@ -270,6 +270,7 @@
 /* Created and Modified items */
 static void
 get_hits_added_modified (TrackerXesamLiveSearch  *self, 
+			 MatchWithEventsFlags     flags,
 			 TrackerDBInterface      *iface, 
 			 GArray                 **added, 
 			 GArray                 **modified) 
@@ -288,13 +289,14 @@
 							 tracker_xesam_live_search_get_join_query (self),
 							 tracker_xesam_live_search_get_where_query (self)); /* Query */
 
-	if (!result_set)
+	if (!result_set) {
 		return;
+	}
 
 	while (ls_valid) {
-		GValue ls_value = { 0, };
-		GValue ev_type = { 0, };
-		gint ls_i_value;
+		GValue       ls_value = { 0, };
+		GValue       ev_type = { 0, };
+		gint         ls_i_value;
 		const gchar *str;
 
 		_tracker_db_result_set_get_value (result_set, 0, &ls_value);
@@ -306,7 +308,7 @@
 
 		if (!strcmp (str, "Update")) {
 			gboolean noadd = FALSE;
-			guint i;
+			guint    i;
 
 			if (m_modified == NULL) {
 				m_modified = g_array_new (FALSE, TRUE, sizeof (guint32));
@@ -398,7 +400,6 @@
 {
 	TrackerDBInterface *iface;
 	TrackerDBResultSet *result_set;
-	GObject            *xesam;
 
 	g_return_if_fail (TRACKER_IS_XESAM_LIVE_SEARCH (self));
 	g_return_if_fail (added != NULL);
@@ -406,7 +407,6 @@
 	g_return_if_fail (modified != NULL);
 
 	iface = tracker_db_manager_get_db_interface (TRACKER_DB_XESAM);
-	xesam = tracker_dbus_get_object (TRACKER_TYPE_XESAM);
 
 	*added = NULL;
 	*removed = NULL;
@@ -449,7 +449,7 @@
 
 	if (flags & MATCH_WITH_EVENTS_CREATES || flags & MATCH_WITH_EVENTS_MODIFIES) {
 		/* Created and Modified items */
-		get_hits_added_modified (self, iface, added, modified);
+		get_hits_added_modified (self, flags, iface, added, modified);
 	}
 }
 
@@ -585,16 +585,16 @@
 {
 	GPtrArray  *result = g_ptr_array_new ();
 	GHashTable *rows = g_hash_table_new (g_int_hash, g_int_equal);
-	gboolean   valid = TRUE;
+	gboolean    valid = TRUE;
 
 	while (valid) {
-		gint       column;
-		GPtrArray *row;
-		//GValue     value_in = {0, };
-		gboolean   insert = FALSE;
+		gint        column;
+		GPtrArray  *row;
+		//GValue      value_in = {0, };
+		gboolean    insert = FALSE;
 
 		// remove static here
-		static gint       key;
+		static gint key;
 
 		// _tracker_db_result_set_get_value (result_set, 0, &value_in);
 		// key must be the first column, as an int, unique per row that
@@ -633,19 +633,27 @@
 		for (column = 0; column < field_count; column++) {
 			GValue cur_value = {0, };
 
-			_tracker_db_result_set_get_value (result_set, column, &cur_value);
+			_tracker_db_result_set_get_value (result_set, 
+							  column, 
+							  &cur_value);
 
 			switch (get_type_for (self, column)) {
 				case ARRAY_OF_STRING: {
-					GValue *variant;
+					GValue    *variant;
 					GPtrArray *my_array;
 
 					if (row->len <= (unsigned int) column) {
 						variant = g_new0 (GValue, 1);
-						g_value_init (variant, dbus_g_type_get_struct("GPtrArray", G_TYPE_STRING));
+						g_value_init (variant, 
+							      dbus_g_type_get_struct("GPtrArray", 
+										     G_TYPE_STRING));
+
 						my_array =  g_ptr_array_new ();
-						g_value_set_boxed_take_ownership (variant, my_array);
+						g_value_set_boxed_take_ownership (variant, 
+										  my_array);
+
 						g_ptr_array_add (row, variant);
+
 					} else {
 						variant = g_ptr_array_index (row, column);
 						my_array = g_value_get_boxed (variant);
@@ -660,13 +668,19 @@
 				case ARRAY_OF_INT: {
 					GValue *variant;
 					GArray *my_array;
-					gint int_val;
+					gint    int_val;
 
 					if (row->len <= (unsigned int) column) {
 						variant = g_new0 (GValue, 1);
-						g_value_init (variant, dbus_g_type_get_struct("GArray", G_TYPE_INT));
-						my_array =  g_array_new (FALSE, TRUE, sizeof (gint));
+						g_value_init (variant, 
+							      dbus_g_type_get_struct("GArray", 
+										     G_TYPE_INT));
+
+						my_array =  g_array_new (FALSE, 
+									 TRUE, 
+									 sizeof (gint));
 						g_value_set_boxed_take_ownership (variant, my_array);
+
 						g_ptr_array_add (row, variant);
 					} else {
 						variant = g_ptr_array_index (row, column);
@@ -681,7 +695,10 @@
 				case SANE_TYPE:
 				default: {
 					GValue *value = g_new0 (GValue, 1);
-					g_value_init (value, G_VALUE_TYPE (&cur_value));
+
+					g_value_init (value, 
+						      G_VALUE_TYPE (&cur_value));
+
 					g_value_copy (&cur_value, value);
 					g_ptr_array_add (row, value);
 				}