tracker r1743 - in branches/indexer-split: . data src/libtracker-db src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Tue Jun 24 09:21:52 2008
New Revision: 1743
URL: http://svn.gnome.org/viewvc/tracker?rev=1743&view=rev

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

	* src/trackerd/tracker-db.c:
	* src/trackerd/tracker-xesam-manager.c:
	* src/libtracker-db/tracker-db-manager.c:
	* data/sqlite-stored-procs.sql:

	Fix for a warning about table Events not existing




Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/data/sqlite-stored-procs.sql
   branches/indexer-split/src/libtracker-db/tracker-db-manager.c
   branches/indexer-split/src/trackerd/tracker-db.c
   branches/indexer-split/src/trackerd/tracker-xesam-manager.c

Modified: branches/indexer-split/data/sqlite-stored-procs.sql
==============================================================================
--- branches/indexer-split/data/sqlite-stored-procs.sql	(original)
+++ branches/indexer-split/data/sqlite-stored-procs.sql	Tue Jun 24 09:21:52 2008
@@ -25,7 +25,6 @@
 GetNewID SELECT OptionValue FROM Options WHERE OptionKey = 'Sequence';
 UpdateNewID UPDATE Options set OptionValue = ? WHERE OptionKey = 'Sequence';
 CreateEvent INSERT INTO Events (ID, ServiceID, EventType) VALUES (?,?,?); 
-DeleteHandledEvents DELETE FROM cache.Events WHERE BeingHandled = 1;
 GetEvents SELECT ID, ServiceID, EventType FROM Events WHERE BeingHandled = 1;
 SetEventsBeingHandled UPDATE Events SET BeingHandled = 1;
 

Modified: branches/indexer-split/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-manager.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-manager.c	Tue Jun 24 09:21:52 2008
@@ -2064,7 +2064,7 @@
 		}
 	}
 	
-	g_object_unref (result_set);	
+	g_object_unref (result_set);
 
 	return TRUE;
 }

Modified: branches/indexer-split/src/trackerd/tracker-db.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-db.c	Tue Jun 24 09:21:52 2008
@@ -2694,9 +2694,7 @@
 {
 	g_return_if_fail (TRACKER_IS_DB_INTERFACE (iface));
 
-	db_exec_proc_no_reply (iface, 
-			       "DeleteHandledEvents", 
-			       NULL);
+	tracker_db_exec (iface, "DELETE FROM Events WHERE BeingHandled = 1");
 }
 
 /* Deprecated */

Modified: branches/indexer-split/src/trackerd/tracker-xesam-manager.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-manager.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-manager.c	Tue Jun 24 09:21:52 2008
@@ -264,6 +264,7 @@
 	gboolean            reason_to_live = FALSE;
 
 	iface = tracker_db_manager_get_db_interface (TRACKER_DB_XESAM);
+
 	g_return_val_if_fail (iface != NULL, FALSE);
 
 	sessions = g_hash_table_get_values (xesam_sessions);