tracker r1335 - branches/indexer-split/src/trackerd

[pvanhoof svn gnome org]

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

Log:
Renamed a few functions

Modified:
   branches/indexer-split/src/trackerd/tracker-db-sqlite.c
   branches/indexer-split/src/trackerd/tracker-db-sqlite.h
   branches/indexer-split/src/trackerd/tracker-xesam-live-search.c
   branches/indexer-split/src/trackerd/tracker-xesam.c

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:02:49 2008
@@ -3251,7 +3251,7 @@
 }
 
 TrackerDBResultSet* 
-tracker_db_get_xeam_hit_count (DBConnection *db_con, const gchar *search_id)
+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);
@@ -3260,7 +3260,7 @@
 
 
 TrackerDBResultSet* 
-tracker_db_get_xesam_live_search_mod_ids (DBConnection *db_con, const gchar *search_id)
+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);
@@ -3268,17 +3268,19 @@
 }
 
 TrackerDBResultSet* 
-tracker_db_get_xesam_live_search_creat_ids (DBConnection *db_con, const gchar *search_id, const gchar *query)
+tracker_db_get_live_search_new_ids (DBConnection *db_con, const gchar *search_id, const gchar *columns, const gchar *tables, const gchar *query)
 {
 	TrackerDBResultSet *result;
 
 	// todo: this is a query for ottela to review
 
 	gchar *m_query = g_strdup_printf (
-			"SELECT ServiceID, ... FROM XesamLiveSearches as X, ... "
-			"INNER JOIN ... "
-			"WHERE X.SearchID = ? AND X.EventType IS 'Create' AND "
-			"(%s)", query);
+			"SELECT E.ServiceID, E.EventType, %s "
+			"FROM XesamLiveSearches as X, Events as E, %s "
+			"X.ServiceID = E.ServiceID "
+			"AND X.SearchID = ? "
+			"AND X.EventType IS 'Create' OR X.EventType IS 'Update' "
+			"AND (%s)", columns, tables, query);
 
 	result = tracker_db_interface_execute_query (db_con->db, NULL, m_query);
 
@@ -3298,7 +3300,7 @@
 }
 
 void 
-tracker_db_delete_handled (DBConnection *db_con, TrackerDBResultSet *events)
+tracker_db_delete_handled_events (DBConnection *db_con, TrackerDBResultSet *events)
 {
 	TrackerDBResultSet *result_set;
 	result_set = tracker_exec_proc (db_con->common, "DeleteHandled", NULL);

Modified: branches/indexer-split/src/trackerd/tracker-db-sqlite.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db-sqlite.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-db-sqlite.h	Fri May  2 17:02:49 2008
@@ -345,14 +345,16 @@
                                                                 gint            value);
 gboolean            tracker_db_integrity_check                 (DBConnection   *db_con);
 TrackerDBResultSet *tracker_db_get_events                      (DBConnection *db_con);
-void                tracker_db_delete_handled                  (DBConnection   *db_con, 
+void                tracker_db_delete_handled_events           (DBConnection   *db_con, 
                                                                 TrackerDBResultSet *events);
-TrackerDBResultSet *tracker_db_get_xesam_live_search_mod_ids   (DBConnection *db_con, 
+TrackerDBResultSet *tracker_db_get_live_search_modified_ids    (DBConnection *db_con, 
                                                                 const gchar *search_id);
-TrackerDBResultSet *tracker_db_get_xesam_live_search_creat_ids (DBConnection *db_con, 
+TrackerDBResultSet *tracker_db_get_live_search_new_ids         (DBConnection *db_con, 
                                                                 const gchar *search_id,
+                                                                const gchar *columns, 
+                                                                const gchar *tables, 
                                                                 const gchar *query);
-TrackerDBResultSet *tracker_db_get_xeam_hit_count              (DBConnection *db_con, 
+TrackerDBResultSet *tracker_db_get_live_search_hit_count       (DBConnection *db_con, 
                                                                 const gchar *search_id);
 
 #endif

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:02:49 2008
@@ -204,7 +204,7 @@
 
 	g_object_get (proxy, "db-connection", &db_con, NULL);
 
-	result_set = tracker_db_get_xesam_live_search_mod_ids (db_con, 
+	result_set = tracker_db_get_live_search_modified_ids (db_con, 
 		tracker_xesam_live_search_get_id (self));
 
 	while (ls_valid) {
@@ -252,9 +252,11 @@
 
 	ls_valid = TRUE;
 
-	result_set = tracker_db_get_xesam_live_search_creat_ids (db_con, 
+	result_set = tracker_db_get_live_search_new_ids (db_con, 
 		tracker_xesam_live_search_get_id (self),
-		tracker_xesam_live_search_get_query (self));
+		"", /* Columns */
+		"", /* Tables */
+		tracker_xesam_live_search_get_query (self)); /* Query */
 
 	while (ls_valid) {
 		GValue ls_value = { 0, };
@@ -330,7 +332,7 @@
 
 		g_object_get (proxy, "db-connection", &db_con, NULL);
 
-		result_set = tracker_db_get_xeam_hit_count (db_con, 
+		result_set = tracker_db_get_live_search_hit_count (db_con, 
 			tracker_xesam_live_search_get_id (self));
 		_tracker_db_result_set_get_value (result_set, 0, &value);
 		*count = g_value_get_int (&value);

Modified: branches/indexer-split/src/trackerd/tracker-xesam.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam.c	Fri May  2 17:02:49 2008
@@ -187,7 +187,7 @@
 		g_list_free (sessions);
 
 		// lock (indexer)
-		tracker_db_delete_handled (db_con, result_set);
+		tracker_db_delete_handled_events (db_con, result_set);
 		// unlock (indexer)
 	}