tracker r1344 - in branches/indexer-split: data src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Mon May  5 09:57:09 2008
New Revision: 1344
URL: http://svn.gnome.org/viewvc/tracker?rev=1344&view=rev

Log:
Added some bugfixes, making Events handling work

Modified:
   branches/indexer-split/data/sqlite-service.sql
   branches/indexer-split/data/sqlite-tracker.sql
   branches/indexer-split/src/trackerd/tracker-db-sqlite.c

Modified: branches/indexer-split/data/sqlite-service.sql
==============================================================================
--- branches/indexer-split/data/sqlite-service.sql	(original)
+++ branches/indexer-split/data/sqlite-service.sql	Mon May  5 09:57:09 2008
@@ -42,23 +42,6 @@
 
 CREATE INDEX  ServiceIndex1 ON Services (ServiceTypeID);
 
-/* This should become a TEMPORARY table */
-CREATE TABLE Events
-(
-	ID		Integer primary key not null,
-	ServiceID	Integer not null,
-	BeingHandled	Integer default 0,
-	EventType	Text
-);
-
-/* This should become a TEMPORARY table */
-CREATE TABLE LiveSearches
-(
-	ID		Integer primary key not null,
-	ServiceID	Integer not null,
-	SearchID	Text
-);
-
 
 /* child service relationships for a specific group/struct metadata */
 CREATE TABLE ChildServices

Modified: branches/indexer-split/data/sqlite-tracker.sql
==============================================================================
--- branches/indexer-split/data/sqlite-tracker.sql	(original)
+++ branches/indexer-split/data/sqlite-tracker.sql	Mon May  5 09:57:09 2008
@@ -9,7 +9,22 @@
 insert Into Options (OptionKey, OptionValue) values ('EventSequence', '1');
 insert Into Options (OptionKey, OptionValue) values ('UpdateCount', '0');
 
+/* This should become a TEMPORARY table */
+CREATE TABLE Events
+(
+	ID		Integer primary key not null,
+	ServiceID	Integer not null,
+	BeingHandled	Integer default 0,
+	EventType	Text
+);
 
+/* This should become a TEMPORARY table */
+CREATE TABLE LiveSearches
+(
+	ID		Integer primary key not null,
+	ServiceID	Integer not null,
+	SearchID	Text
+);
 
 /* store volume and HAL info here for files */
 CREATE TABLE  Volumes

Modified: branches/indexer-split/src/trackerd/tracker-db-sqlite.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db-sqlite.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-db-sqlite.c	Mon May  5 09:57:09 2008
@@ -3309,7 +3309,7 @@
 
 	tracker_debug ("LiveSearchUpdateQuery: %s", m_query);
 
-	result = tracker_db_interface_execute_query (db_con->db, NULL, m_query);
+	result = tracker_db_interface_execute_query (db_con->common, NULL, m_query);
 
 	g_static_rec_mutex_unlock (&events_table_lock);
 
@@ -3389,7 +3389,7 @@
 	/* Uses the Events table */
 	tracker_debug ("CreateEvent %s", eid);
 
-	result_set = tracker_exec_proc (db_con, "CreateEvent", eid, service_id_str, type, NULL);
+	result_set = tracker_exec_proc (db_con->common, "CreateEvent", eid, service_id_str, type, NULL);
 	id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (db_con->db));
 	if (result_set)
 		g_object_unref (result_set);