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

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Fri Jun  6 10:03:56 2008
New Revision: 1595
URL: http://svn.gnome.org/viewvc/tracker?rev=1595&view=rev

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

	* src/libtracker-db/tracker-db-interface-sqlite.c:
	* src/trackerd/tracker-xesam-live-search.c: Some minor bugfixes. Delaying 
	the SearchDone for a second (maybe we can remove this later)
	* data/sqlite-stored-procs.sql: Two syntax errors in the SQL queries



Modified:
   branches/xesam-support/ChangeLog
   branches/xesam-support/data/sqlite-stored-procs.sql
   branches/xesam-support/src/libtracker-db/tracker-db-interface-sqlite.c
   branches/xesam-support/src/trackerd/tracker-xesam-live-search.c

Modified: branches/xesam-support/data/sqlite-stored-procs.sql
==============================================================================
--- branches/xesam-support/data/sqlite-stored-procs.sql	(original)
+++ branches/xesam-support/data/sqlite-stored-procs.sql	Fri Jun  6 10:03:56 2008
@@ -30,8 +30,8 @@
 SetEventsBeingHandled UPDATE Events SET BeingHandled = 1;
 
 GetLiveSearchAllIDs SELECT X.ServiceID FROM LiveSearches AS X WHERE X.SearchID = ?
-GetLiveSearchDeletedIDs SELECT E.ServiceID FROM Events as E, LiveSearches as X WHERE E.ServiceID = X.ServiceID AND X.SearchID = ? AND E.EventType IS 'Delete';
-DeleteLiveSearchDeletedIDs DELETE FROM LiveSearches AS Y WHERE Y.ServiceID IN SELECT ServiceID FROM Events as E, LiveSearches as X WHERE E.ServiceID = X.ServiceID AND X.SearchID = ? AND E.EventType IS 'Delete'
+GetLiveSearchDeletedIDs SELECT E.ServiceID FROM Events as E, LiveSearches as X WHERE E.ServiceID = X.ServiceID AND X.SearchID = ? AND E.EventType = 'Delete';
+DeleteLiveSearchDeletedIDs DELETE FROM LiveSearches AS Y WHERE Y.ServiceID IN SELECT ServiceID FROM Events as E, LiveSearches as X WHERE E.ServiceID = X.ServiceID AND X.SearchID = ? AND E.EventType = 'Delete'
 
 GetLiveSearchHitCount SELECT count(*) FROM LiveSearches WHERE SearchID = ?;
 LiveSearchStopSearch DELETE FROM LiveSearches WHERE SearchID = ?

Modified: branches/xesam-support/src/libtracker-db/tracker-db-interface-sqlite.c
==============================================================================
--- branches/xesam-support/src/libtracker-db/tracker-db-interface-sqlite.c	(original)
+++ branches/xesam-support/src/libtracker-db/tracker-db-interface-sqlite.c	Fri Jun  6 10:03:56 2008
@@ -328,6 +328,13 @@
 	}
 }
 
+static void
+foreach_print_error (gpointer key, gpointer value, gpointer stmt)
+{
+	if (value == stmt)
+		g_print ("In %s\n", (char*) key);
+}
+
 static TrackerDBResultSet *
 create_result_set_from_stmt (TrackerDBInterfaceSqlite  *interface,
 			     sqlite3_stmt              *stmt,
@@ -377,6 +384,9 @@
 	}
 
 	if (result != SQLITE_DONE) {
+		
+		g_hash_table_foreach (priv->statements, foreach_print_error, stmt);
+		
 		if (result == SQLITE_CORRUPT) {
 			g_critical ("Database %s is corrupt. Can't live without it", priv->filename);
 			g_assert_not_reached ();

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	Fri Jun  6 10:03:56 2008
@@ -891,8 +891,7 @@
 		if (hits) {
 			g_array_free (hits, TRUE);
 		}
-		
-		tracker_xesam_live_search_emit_done (self);
+		g_timeout_add (1000, tracker_xesam_live_search_emit_done, self);
 	}
 
 	priv->active = TRUE;