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

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Tue May  6 10:30:40 2008
New Revision: 1355
URL: http://svn.gnome.org/viewvc/tracker?rev=1355&view=rev

Log:
Adding code comments

Modified:
   branches/indexer-split/src/trackerd/tracker-xesam-live-search.c
   branches/indexer-split/src/trackerd/tracker-xesam-session.c
   branches/indexer-split/src/trackerd/tracker-xesam.c

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	Tue May  6 10:30:40 2008
@@ -37,7 +37,7 @@
 	PROP_XMLQUERY
 };
 
-G_DEFINE_TYPE(TrackerXesamLiveSearch, tracker_xesam_live_search, G_TYPE_OBJECT)
+G_DEFINE_TYPE (TrackerXesamLiveSearch, tracker_xesam_live_search, G_TYPE_OBJECT)
 
 #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_XESAM_LIVE_SEARCH, TrackerXesamLiveSearch))
 
@@ -65,9 +65,9 @@
 
 static void
 xexam_search_set_property (GObject      *object,
-                          guint 	param_id,
-                          const GValue *value,
-                          GParamSpec   *pspec)
+			   guint 	param_id,
+			   const GValue *value,
+			   GParamSpec   *pspec)
 {
 	switch (param_id) {
 	case PROP_XMLQUERY:
@@ -416,6 +416,11 @@
 			GValue *value = g_new0 (GValue, 1);
 			GValue value_in = {0, };
 
+			// Question for ottela: how will we do list-values like
+			// xesam:userKeywords? That's a column with comma's? or
+			// how is this done? An extra result_set to loop? An
+			// extra query? A union?
+
 			_tracker_db_result_set_get_value (result_set, column, &value_in);
 
 			g_value_init (value, G_VALUE_TYPE (&value_in));
@@ -461,7 +466,11 @@
 				TRACKER_XESAM_ERROR_SEARCH_NOT_ACTIVE,
 				"Search is not active");
 	else {
-		get_hit_data (self, NULL, hits);
+		TrackerDBResultSet *result_set = NULL;
+
+		// For ottela: fetch results for get_hits
+
+		get_hit_data (self, result_set, hits);
 	}
 }
 
@@ -506,7 +515,11 @@
 				TRACKER_XESAM_ERROR_SEARCH_NOT_ACTIVE,
 				"Search is not active yet");
 	else {
-		get_hit_data (self, NULL, hit_data);
+		TrackerDBResultSet *result_set = NULL;
+
+		// For ottela: fetch results for get_hit_data
+
+		get_hit_data (self, result_set, hits);
 	}
 }
 

Modified: branches/indexer-split/src/trackerd/tracker-xesam-session.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-xesam-session.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-xesam-session.c	Tue May  6 10:30:40 2008
@@ -28,8 +28,7 @@
 	GHashTable *props;
 };
 
-G_DEFINE_TYPE(TrackerXesamSession, tracker_xesam_session, G_TYPE_OBJECT)
-
+G_DEFINE_TYPE (TrackerXesamSession, tracker_xesam_session, G_TYPE_OBJECT)
 
 static void
 tracker_xesam_session_g_value_free (GValue *value)
@@ -371,6 +370,7 @@
 	TrackerXesamLiveSearch *search;
 	TrackerXesamSessionPriv *priv = self->priv;
 
+	// ottela!
 	// todo: parse the query and pass the parsed query or throw an error
 
 	search = tracker_xesam_live_search_new (query_xml);

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	Tue May  6 10:30:40 2008
@@ -35,8 +35,8 @@
 
 TrackerXesamSession *
 tracker_xesam_create_session (TrackerDBusXesam  *dbus_proxy, 
-                              gchar            **session_id, 
-                              GError           **error)
+			      gchar            **session_id, 
+			      GError           **error)
 {
 	TrackerXesamSession *session;
 
@@ -216,6 +216,14 @@
 {
 	/* This happens each time a new event is created */
 
+	/* We could do this in a thread too, in case blocking the GMainLoop is
+	 * not ideal (it's not, because during these blocks of code, no DBus
+	 * request handler can run). I have added sufficient locking to let a
+	 * thread do it too (although untested).
+	 * 
+	 * In case of a thread we could use usleep() and stop the thread if
+	 * we didn't get a wakeup-call nor we had items to process this loop */
+
 	if (!live_search_handler_running) {
 		live_search_handler_running = TRUE;
 		g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,