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

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Fri Apr 25 08:29:03 2008
New Revision: 1308
URL: http://svn.gnome.org/viewvc/tracker?rev=1308&view=rev

Log:
Cleaning up, various fixes

Modified:
   branches/xesam-support/src/trackerd/tracker-xesam-live-search.c
   branches/xesam-support/src/trackerd/tracker-xesam-search.c
   branches/xesam-support/src/trackerd/tracker-xesam-search.h
   branches/xesam-support/src/trackerd/tracker-xesam-session.c

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	Fri Apr 25 08:29:03 2008
@@ -70,9 +70,7 @@
 void 
 tracker_xesam_live_search_emit_hits_added (TrackerXesamLiveSearch *self, guint count) 
 {
-	TrackerXesamSearch *proxy;
-
-	proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
+	TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
 
 	g_signal_emit (proxy, xesam_signals[XESAM_HITS_ADDED], 0, 
 		tracker_xesam_live_search_get_id (self), count);
@@ -93,11 +91,7 @@
 void 
 tracker_xesam_live_search_emit_hits_removed (TrackerXesamLiveSearch *self, GArray *hit_ids) 
 {
-	TrackerXesamSearch *proxy;
-
-	proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
-
-	// todo
+	TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
 
 	g_signal_emit (proxy, xesam_signals[XESAM_HITS_REMOVED], 0, 
 		tracker_xesam_live_search_get_id (self), hit_ids); 
@@ -118,11 +112,7 @@
 void 
 tracker_xesam_live_search_emit_hits_modified (TrackerXesamLiveSearch *self, GArray *hit_ids) 
 {
-	TrackerXesamSearch *proxy;
-
-	proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
-
-	// todo
+	TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
 
 	g_signal_emit (proxy, xesam_signals[XESAM_HITS_MODIFIED], 0, 
 		tracker_xesam_live_search_get_id (self), hit_ids); 
@@ -143,9 +133,7 @@
 void 
 tracker_xesam_live_search_emit_done (TrackerXesamLiveSearch *self) 
 {
-	TrackerXesamSearch *proxy;
-
-	proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
+	TrackerXesamSearch *proxy = TRACKER_XESAM_SEARCH (tracker_dbus_get_object (TRACKER_TYPE_XESAM_SEARCH));
 
 	g_signal_emit (proxy, xesam_signals[XESAM_SEARCH_DONE], 0, 
 		tracker_xesam_live_search_get_id (self)); 
@@ -167,6 +155,7 @@
 				TRACKER_XESAM_ERROR_SEARCH_CLOSED,
 				"Search was already closed");
 	priv->closed = TRUE;
+
 	// todo
 }
 
@@ -280,6 +269,7 @@
 tracker_xesam_live_search_is_active (TrackerXesamLiveSearch *self)
 {
 	TrackerXesamLiveSearchPriv *priv = self->priv;
+
 	return priv->active;
 }
 
@@ -295,12 +285,15 @@
 tracker_xesam_live_search_activate (TrackerXesamLiveSearch *self, GError **error)
 {
 	TrackerXesamLiveSearchPriv *priv = self->priv;
-	// todo
+
 	if (priv->closed)
 		g_set_error (error, TRACKER_XESAM_ERROR, 
 				TRACKER_XESAM_ERROR_SEARCH_CLOSED,
 				"Search is closed");
+
 	priv->active = TRUE;
+
+	// todo
 }
 
 
@@ -308,6 +301,8 @@
  * tracker_xesam_live_search_get_query:
  * @self: a #TrackerXesamLiveSearch
  *
+ * * API will change *
+ *
  * Gets the query
  *
  * @returns: a read-only string with the query
@@ -315,7 +310,9 @@
 const gchar* 
 tracker_xesam_live_search_get_query (TrackerXesamLiveSearch *self)
 {
+
 	// todo
+
 	return "WHERE 1=1";
 }
 
@@ -331,6 +328,7 @@
 tracker_xesam_live_search_set_id (TrackerXesamLiveSearch *self, const gchar *search_id)
 {
 	TrackerXesamLiveSearchPriv *priv = self->priv;
+
 	if (priv->search_id)
 		g_free (priv->search_id);
 	priv->search_id = g_strdup (search_id);
@@ -348,6 +346,7 @@
 tracker_xesam_live_search_get_id (TrackerXesamLiveSearch *self)
 {
 	TrackerXesamLiveSearchPriv *priv = self->priv;
+
 	return (const gchar*) priv->search_id;
 }
 
@@ -361,9 +360,7 @@
 TrackerXesamLiveSearch* 
 tracker_xesam_live_search_new (const gchar *query_xml) 
 {
-	TrackerXesamLiveSearch * self;
-	self = g_object_newv (TRACKER_TYPE_XESAM_LIVE_SEARCH, 0, NULL);
-	return self;
+	return g_object_newv (TRACKER_TYPE_XESAM_LIVE_SEARCH, 0, NULL);
 }
 
 

Modified: branches/xesam-support/src/trackerd/tracker-xesam-search.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-xesam-search.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-xesam-search.c	Fri Apr 25 08:29:03 2008
@@ -19,9 +19,6 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include <string.h>
-
-#include <libtracker-common/tracker-log.h>
 
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-config.h>
@@ -42,17 +39,16 @@
 #include "tracker-marshal.h"
 
 guint xesam_signals[XESAM_LAST_SIGNAL] = {0};
-extern Tracker *tracker;
-
-#define DEFAULT_SEARCH_MAX_HITS 1024
-
-
-
-static void xesam_search_finalize     (GObject *object);
 
 G_DEFINE_TYPE(TrackerXesamSearch, tracker_xesam_search, G_TYPE_OBJECT)
 
 static void
+xesam_search_finalize (GObject *object)
+{
+	G_OBJECT_CLASS (tracker_xesam_search_parent_class)->finalize (object);
+}
+
+static void
 tracker_xesam_search_class_init (TrackerXesamSearchClass *klass)
 {
 	GObjectClass *object_class;
@@ -127,19 +123,11 @@
 {
 }
 
-static void
-xesam_search_finalize (GObject *object)
-{
-	G_OBJECT_CLASS (tracker_xesam_search_parent_class)->finalize (object);
-}
-
 
 TrackerXesamSearch *
 tracker_xesam_search_new (void)
 {
-	TrackerXesamSearch *object;
-	object = g_object_new (TRACKER_TYPE_XESAM_SEARCH, NULL);
-	return object;
+	return g_object_new (TRACKER_TYPE_XESAM_SEARCH, NULL);
 }
 
 /*
@@ -148,22 +136,16 @@
 
 gboolean 
 tracker_xesam_search_new_session (TrackerXesamSearch   *object,
-				  const gchar         **session_id,
+				  gchar               **session_id,
 				  GError              **error)
 {
-	gchar *sid = NULL;
+	guint request_id = tracker_dbus_get_next_request_id ();
 
-	tracker_xesam_create_session (object, &sid, error);
+	tracker_xesam_create_session (object, session_id, error);
 
-	if (sid) {
-		guint request_id = tracker_dbus_get_next_request_id ();
-		*session_id = g_strdup (sid);
-		g_free (sid);
-		tracker_dbus_request_success (request_id);
-		return TRUE;
-	}
+	tracker_dbus_request_success (request_id);
 
-	return FALSE;
+	return (error == NULL);
 }
 
 
@@ -183,13 +165,14 @@
 			searches = g_list_next (searches);
 		}
 		g_list_free (searches);
+
+		tracker_xesam_close_session (session_id, error);
 		g_object_unref (session);
 	}
 
-	tracker_xesam_close_session (session_id, error);
 	tracker_dbus_request_success (request_id);
 
-	return TRUE;
+	return (error == NULL);
 }
 
 
@@ -211,7 +194,7 @@
 
 	tracker_dbus_request_success (request_id);
 
-	return TRUE;
+	return (error == NULL);
 }
 
 gboolean 
@@ -225,15 +208,13 @@
 	TrackerXesamSession *session = tracker_xesam_get_session (session_id, error);
 
 	if (session) {
-		GValue *ret = NULL;
-		tracker_xesam_session_get_property (session, prop, &ret, error);
-		g_value_copy (ret, *value);
-		g_value_unset (ret);
+		tracker_xesam_session_get_property (session, prop, value, error);
+		g_object_unref (session);
 	}
 
 	tracker_dbus_request_success (request_id);
 
-	return TRUE;
+	return (error == NULL);
 }
 
 
@@ -249,19 +230,17 @@
 
 	if (session) {
 		TrackerXesamLiveSearch *search;
-		gchar *ret = NULL;
-		search = tracker_xesam_session_create_search (session, query_xml, &ret, error);
-		if (ret) {
-			*search_id = g_strdup (ret);
-			g_free (ret);
-		}
+		search = tracker_xesam_session_create_search (session, query_xml, search_id, error);
+
 		if (search)
 			g_object_unref (search);
+
+		g_object_unref (session);
 	}
 
 	tracker_dbus_request_success (request_id);
 
-	return TRUE;
+	return (error == NULL);
 }
 
 gboolean 
@@ -279,7 +258,7 @@
 
 	tracker_dbus_request_success (request_id);
 
-	return TRUE;
+	return (error == NULL);
 }
 
 gboolean 
@@ -298,7 +277,7 @@
 
 	tracker_dbus_request_success (request_id);
 
-	return TRUE;
+	return (error == NULL);
 }
 
 gboolean 
@@ -318,7 +297,7 @@
 
 	tracker_dbus_request_success (request_id);
 
-	return TRUE;
+	return (error == NULL);
 }
 
 gboolean 
@@ -339,7 +318,7 @@
 
 	tracker_dbus_request_success (request_id);
 
-	return TRUE;
+	return (error == NULL);
 }
 
 gboolean 
@@ -357,7 +336,7 @@
 
 	tracker_dbus_request_success (request_id);
 
-	return TRUE;
+	return (error == NULL);
 }
 
 gboolean 
@@ -393,6 +372,5 @@
 void 
 tracker_xesam_search_emit_state_changed (TrackerXesamSearch *self, GStrv state_info) 
 {
- 	// todo
 	g_signal_emit (self, xesam_signals[XESAM_STATE_CHANGED], 0, state_info);
 }

Modified: branches/xesam-support/src/trackerd/tracker-xesam-search.h
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-xesam-search.h	(original)
+++ branches/xesam-support/src/trackerd/tracker-xesam-search.h	Fri Apr 25 08:29:03 2008
@@ -74,7 +74,7 @@
 
 
 gboolean tracker_xesam_search_new_session      (TrackerXesamSearch   *object,
-						const gchar         **session,
+						gchar               **session,
 						GError              **error);
 gboolean tracker_xesam_search_set_property     (TrackerXesamSearch   *object,
 						const gchar         *session_id,

Modified: branches/xesam-support/src/trackerd/tracker-xesam-session.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-xesam-session.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-xesam-session.c	Fri Apr 25 08:29:03 2008
@@ -36,7 +36,6 @@
 	TrackerXesamSessionPriv *priv = self->priv;
 
 	priv->session_id = NULL;
-
 	priv->searches = g_hash_table_new_full (g_str_hash, g_str_equal, 
 		(GDestroyNotify) g_free,
 		(GDestroyNotify) g_object_unref);
@@ -48,6 +47,7 @@
 {
 	TrackerXesamSession *self = (TrackerXesamSession *) object;
 	TrackerXesamSessionPriv *priv = self->priv;
+
 	g_free (priv->session_id);
 	g_hash_table_destroy (priv->searches);
 }
@@ -71,6 +71,7 @@
 tracker_xesam_session_set_id (TrackerXesamSession *self, const gchar *session_id)
 {
 	TrackerXesamSessionPriv *priv = self->priv;
+
 	if (priv->session_id)
 		g_free (priv->session_id);
 	priv->session_id = g_strdup (session_id);
@@ -88,6 +89,7 @@
 tracker_xesam_session_get_id (TrackerXesamSession *self)
 {
 	TrackerXesamSessionPriv *priv = self->priv;
+
 	return (const gchar*) priv->session_id;
 }
 
@@ -106,6 +108,7 @@
 tracker_xesam_session_get_searches (TrackerXesamSession *self)
 {
 	TrackerXesamSessionPriv *priv = self->priv;
+
 	return g_hash_table_get_values (priv->searches);
 }
 
@@ -161,6 +164,7 @@
 tracker_xesam_session_get_property (TrackerXesamSession *self, const gchar *prop, GValue **value, GError **error) 
 {
 	// todo
+
 	return;
 }
 
@@ -188,7 +192,7 @@
 	TrackerXesamLiveSearch *search;
 	TrackerXesamSessionPriv *priv = self->priv;
 
-	// todo: parse the query and pass the parsed query or error
+	// todo: parse the query and pass the parsed query or throw an error
 
 	search = tracker_xesam_live_search_new (query_xml);
 	tracker_xesam_live_search_set_id (search, tracker_unique_key ());
@@ -219,8 +223,10 @@
 {
 	TrackerXesamSessionPriv *priv = self->priv;
 	TrackerXesamLiveSearch *search = g_hash_table_lookup (priv->searches, search_id);
+
 	if (search)
 		g_object_ref (search);
+
 	return search;
 }