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

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Fri May  2 17:27:47 2008
New Revision: 1336
URL: http://svn.gnome.org/viewvc/tracker?rev=1336&view=rev

Log:
Renaming a few database related things

Modified:
   branches/indexer-split/data/sqlite-service.sql
   branches/indexer-split/data/sqlite-stored-procs.sql
   branches/indexer-split/src/trackerd/tracker-db-sqlite.c
   branches/indexer-split/src/trackerd/tracker-xesam-live-search.c

Modified: branches/indexer-split/data/sqlite-service.sql
==============================================================================
--- branches/indexer-split/data/sqlite-service.sql	(original)
+++ branches/indexer-split/data/sqlite-service.sql	Fri May  2 17:27:47 2008
@@ -50,7 +50,7 @@
 	EventType	Text
 );
 
-CREATE TABLE XesamLiveSearches
+CREATE TABLE LiveSearches
 (
 	ID		Integer primary key not null,
 	ServiceID	Integer not null,

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	Fri May  2 17:27:47 2008
@@ -25,12 +25,12 @@
 GetNewID SELECT OptionValue FROM Options WHERE OptionKey = 'Sequence';
 UpdateNewID UPDATE Options set OptionValue = ? WHERE OptionKey = 'Sequence';
 CreateEvent INSERT INTO Events (ID, ServiceID, EventType) VALUES (?,?,?); 
-DeleteHandled DELETE FROM Events WHERE BeingHandled = 1;
+DeleteHandledEvents DELETE FROM Events WHERE BeingHandled = 1;
 GetEvents SELECT ID, ServiceID, EventType FROM Events WHERE BeingHandled = 0;
-SetBeingHandled UPDATE Events SET BeingHandled = 1;
+SetEventsBeingHandled UPDATE Events SET BeingHandled = 1;
 
-GetXesamLiveSearchModifiedIDs SELECT E.ServiceID FROM Events as E, XesamLiveSearches as X WHERE E.ServiceID = X.ServiceID AND X.SearchID = ? AND E.EventType IS NOT 'Create';
-GetXesamHitCount SELECT count(*) FROM XesamLiveSearches WHERE SearchID = ?;
+GetLiveSearchModifiedIDs SELECT E.ServiceID FROM Events as E, LiveSearches as X WHERE E.ServiceID = X.ServiceID AND X.SearchID = ? AND E.EventType IS NOT 'Create';
+GetLiveSearchHitCount SELECT count(*) FROM LiveSearches WHERE SearchID = ?;
 
 GetNewEventID SELECT OptionValue FROM Options WHERE OptionKey = 'EventSequence';
 UpdateNewEventID UPDATE Options set OptionValue = ? WHERE OptionKey = 'EventSequence';

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	Fri May  2 17:27:47 2008
@@ -3254,7 +3254,7 @@
 tracker_db_get_live_search_hit_count (DBConnection *db_con, const gchar *search_id)
 {
 	TrackerDBResultSet *result;
-	result = tracker_exec_proc (db_con->common, "GetXesamHitCount", search_id, NULL);
+	result = tracker_exec_proc (db_con->common, "GetLiveSearchHitCount", search_id, NULL);
 	return result;
 }
 
@@ -3263,7 +3263,7 @@
 tracker_db_get_live_search_modified_ids (DBConnection *db_con, const gchar *search_id)
 {
 	TrackerDBResultSet *result;
-	result = tracker_exec_proc (db_con->common, "GetXesamLiveSearchModifiedIDs", search_id, NULL);
+	result = tracker_exec_proc (db_con->common, "GetLiveSearchModifiedIDs", search_id, NULL);
 	return result;
 }
 
@@ -3294,7 +3294,7 @@
 {
 	TrackerDBResultSet *result_set, *result;
 	result = tracker_exec_proc (db_con->common, "GetEvents", NULL);
-	result_set = tracker_exec_proc (db_con->common, "SetBeingHandled", NULL);
+	result_set = tracker_exec_proc (db_con->common, "SetEventsBeingHandled", NULL);
 	g_object_unref (result_set);
 	return result;
 }
@@ -3303,7 +3303,7 @@
 tracker_db_delete_handled_events (DBConnection *db_con, TrackerDBResultSet *events)
 {
 	TrackerDBResultSet *result_set;
-	result_set = tracker_exec_proc (db_con->common, "DeleteHandled", NULL);
+	result_set = tracker_exec_proc (db_con->common, "DeleteHandledEvents", NULL);
 	g_object_unref (result_set);
 }
 

Modified: branches/indexer-split/src/trackerd/tracker-xesam-live-search.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-live-search.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-live-search.c	Fri May  2 17:27:47 2008
@@ -252,6 +252,8 @@
 
 	ls_valid = TRUE;
 
+	// For ottela to review (add columns and tables)
+
 	result_set = tracker_db_get_live_search_new_ids (db_con, 
 		tracker_xesam_live_search_get_id (self),
 		"", /* Columns */