tracker r1409 - branches/xesam-support/src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Tue May 13 13:34:58 2008
New Revision: 1409
URL: http://svn.gnome.org/viewvc/tracker?rev=1409&view=rev

Log:
Added some comments, improved some database ops

Modified:
   branches/xesam-support/src/trackerd/tracker-db-sqlite.c
   branches/xesam-support/src/trackerd/tracker-xesam-live-search.c

Modified: branches/xesam-support/src/trackerd/tracker-db-sqlite.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-db-sqlite.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-db-sqlite.c	Tue May 13 13:34:58 2008
@@ -1173,6 +1173,9 @@
 	tracker_db_attach_db (db_con, TRACKER_DB_COMMON);
 	tracker_db_attach_db (db_con, TRACKER_DB_CACHE);
 
+	/* this is not needed, it's the root db
+	tracker_db_attach_db (db_con, TRACKER_DB_FILE_META); */
+
 	db_con->cache = db_con;
 	db_con->common = db_con;
 
@@ -3167,28 +3170,39 @@
 TrackerDBResultSet* 
 tracker_db_get_live_search_hit_count (DBConnection *db_con, const gchar *search_id)
 {
-	TrackerDBResultSet *result;
 	tracker_debug ("GetLiveSearchHitCount");
-	result = tracker_exec_proc (db_con->cache, "GetLiveSearchHitCount", search_id, NULL);
-	return result;
+
+	/* SELECT count(*) 
+	 * FROM LiveSearches 
+	 * WHERE SearchID = ? */
+
+	return tracker_exec_proc (db_con->cache, "GetLiveSearchHitCount", search_id, NULL);
 }
 
 
 TrackerDBResultSet* 
 tracker_db_get_live_search_deleted_ids (DBConnection *db_con, const gchar *search_id)
 {
-	TrackerDBResultSet *result;
-
 	tracker_debug ("GetLiveSearchDeletedIDs");
-	result = tracker_exec_proc (db_con->cache, "GetLiveSearchDeletedIDs", search_id, NULL);
 
-	return result;
+	/* SELECT E.ServiceID 
+	 * FROM Events as E, LiveSearches as X 
+	 * WHERE E.ServiceID = X.ServiceID 
+	 * AND X.SearchID = ? 
+	 * AND E.EventType IS 'Delete' */
+
+	return tracker_exec_proc (db_con->cache, "GetLiveSearchDeletedIDs", search_id, NULL);
 }
 
 void
 tracker_db_stop_live_search (DBConnection *db_con, const gchar *search_id)
 {
 	tracker_debug ("LiveSearchStopSearch");
+
+	/* DELETE 
+	 * FROM LiveSearches as X 
+	 * WHERE E.SearchID = ? */
+
 	tracker_exec_proc_no_reply (db_con->cache, "LiveSearchStopSearch", search_id, NULL);
 }
 
@@ -3196,8 +3210,13 @@
 void
 tracker_db_start_live_search (DBConnection *db_con, const gchar *from_query, const gchar *where_query, const gchar *search_id)
 {
-	tracker_debug ("LiveSearchStartSearch");
-	// TODO
+	/* INSERT
+	 * INTO LiveSearches
+	 * SELECT ID, SEARCH_ID FROM_QUERY WHERE_QUERY */
+
+	tracker_db_exec_no_reply (db_con->db,  NULL,
+		"INSERT INTO LiveSearches SELECT ID, '%s' %s %s",
+			search_id, from_query, where_query);
 }
 
 TrackerDBResultSet* 
@@ -3207,18 +3226,29 @@
 
 	// todo: this is a query for ottela to review
 
-	// Contract, in @result:
-	// ServiceID is #1
-	// EventType is #2
+	/* Contract, in @result:
+	 * ServiceID is #1
+	 * EventType is #2 */
+
+	/**
+	 * SELECT E.ServiceID, E.EventType, COLUMNS
+	 * FROM_QUERY XesamLiveSearches as X, Events as E
+	 * WHERE_QUERY"
+	 * AND X.ServiceID = E.ServiceID
+	 * AND X.SearchID = SEARCH_ID
+	 * AND (X.EventType IS 'Create' 
+	 *      OR X.EventType IS 'Update')
+	 **/
 
 	/* Uses the Events table */
 	gchar *m_query = g_strdup_printf (
 	/* COLUMNS */      "SELECT E.ServiceID, E.EventType%s%s "
-	/* FROM_QUERY */   "%s%s XesamLiveSearches as X, Events as E "
+	/* FROM_QUERY */   "%s%s LiveSearches as X, Events as E "
 	/* WHERE_QUERY */  "%s"
 	/* AND or space */ "%sX.ServiceID = E.ServiceID "
 			   "AND X.SearchID = ? "
-			   "AND X.EventType IS 'Create' OR X.EventType IS 'Update' ",
+			   "AND (X.EventType IS 'Create' "
+			   "OR X.EventType IS 'Update') ",
 		columns?", ":"", 
 		columns?columns:"", 
 		from_query?from_query:"FROM",
@@ -3228,7 +3258,7 @@
 
 	tracker_debug ("LiveSearchUpdateQuery: %s", m_query);
 
-	result = tracker_db_interface_execute_query (db_con->common->db, NULL, m_query);
+	result = tracker_db_interface_execute_query (db_con->db, NULL, m_query);
 
 	g_free (m_query);
 
@@ -3238,28 +3268,19 @@
 TrackerDBResultSet* 
 tracker_db_get_events (DBConnection *db_con)
 {
-	TrackerDBResultSet *result;
-
 	tracker_debug ("SetEventsBeingHandled");
 	tracker_exec_proc_no_reply (db_con->cache, "SetEventsBeingHandled", NULL);
+
 	tracker_debug ("GetEvents");
-	result = tracker_exec_proc (db_con->cache, "GetEvents", NULL);
-	return result;
+	return tracker_exec_proc (db_con->cache, "GetEvents", NULL);
 }
 
 
 void 
 tracker_db_delete_handled_events (DBConnection *db_con, TrackerDBResultSet *events)
 {
-	TrackerDBResultSet *result_set;
-
-	/* Uses the Events table */
 	tracker_debug ("DeleteHandledEvents");
-
-	result_set = tracker_exec_proc (db_con->cache, "DeleteHandledEvents", NULL);
-	if (result_set)
-		g_object_unref (result_set);
-
+	tracker_exec_proc_no_reply (db_con->cache, "DeleteHandledEvents", NULL);
 }
 
 static guint32

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	Tue May 13 13:34:58 2008
@@ -232,20 +232,13 @@
 
 	g_object_get (proxy, "db-connection", &db_con, NULL);
 
+	/* Deleted items */
+
 	result_set = tracker_db_get_live_search_deleted_ids (db_con, 
 		tracker_xesam_live_search_get_id (self));
 
 	if (!result_set)
-		return;
-
-
-	/** 
-	 * Deleted items:
-	 * SELECT E.ServiceID FROM Events as E, LiveSearches as X 
-	 * WHERE E.ServiceID = X.ServiceID 
-	 * AND X.SearchID = ? 
-	 * AND E.EventType IS 'Delete' 
-	 **/
+		goto part_two;
 
 	while (ls_valid) {
 		GValue ls_value = { 0, };
@@ -265,21 +258,12 @@
 
 	g_object_unref (result_set);
 
+part_two:
 
+	/* Created and Modified items */
 
 	ls_valid = TRUE;
 
-	// For ottela to review (add columns and tables)
-
-	/**
-	 * SELECT E.ServiceID, E.EventType, COLUMNS
-	 * FROM_QUERY XesamLiveSearches as X, Events as E
-	 * WHERE_QUERY"
-	 * AND X.ServiceID = E.ServiceID
-	 * AND X.SearchID = SEARCH_ID
-	 * AND X.EventType IS 'Create' OR X.EventType IS 'Update'
-	 **/
-
 	result_set = tracker_db_get_live_search_new_ids (db_con, 
 		tracker_xesam_live_search_get_id (self),
 		NULL, /* Columns */