[tracker] Removed the SqlQuery method of the Search DBus object

[Jürg Billeter <juergbi src gnome org>]

commit 9c01662d96719bb76bca8afb4e1228ce807602f0
Author: Philip Van Hoof <philip codeminded be>
Date:   Wed Apr 8 10:18:12 2009 +0200

    Removed the SqlQuery method of the Search DBus object
---
 data/dbus/tracker-search.xml  |   14 ------
 src/trackerd/tracker-search.c |   89 -----------------------------------------
 src/trackerd/tracker-search.h |    4 --
 3 files changed, 0 insertions(+), 107 deletions(-)

diff --git a/data/dbus/tracker-search.xml b/data/dbus/tracker-search.xml
index 45e82e9..1cb1b96 100644
--- a/data/dbus/tracker-search.xml
+++ b/data/dbus/tracker-search.xml
@@ -120,19 +120,5 @@
       <arg type="s" name="result" direction="out" />
     </method>
 
-    <!-- This method is only to be used for prototyping and development
-	purposes. Please do not use it for actual applications as the
-	DB schema is not only not guaranteed not to change, it's also 
-	guaranteed to change indeed. -->
-
-    <!-- Please do not use this in your applictions. You have been warned
-	twice now. -->
-
-    <method name="SqlQuery">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-      <arg type="s" name="query" direction="in" />
-      <arg type="aas" name="result" direction="out" />
-    </method>
-
   </interface>
 </node>
diff --git a/src/trackerd/tracker-search.c b/src/trackerd/tracker-search.c
index 04a8228..72ee554 100644
--- a/src/trackerd/tracker-search.c
+++ b/src/trackerd/tracker-search.c
@@ -49,16 +49,12 @@
 #define TRACKER_SEARCH_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_SEARCH, TrackerSearchPrivate))
 
 #define DEFAULT_SEARCH_MAX_HITS      1024
-#define KEEPALIVE_TIME_FOR_SQL_QUERY 600
 
 typedef struct {
 	TrackerConfig	   *config;
 	TrackerLanguage    *language;
 	TrackerDBIndex	   *file_index;
 	TrackerDBIndex	   *email_index;
-
-	TrackerDBInterface *sql_query_iface;
-	guint               sql_query_timeout_id;
 } TrackerSearchPrivate;
 
 static void tracker_search_finalize (GObject *object);
@@ -89,14 +85,6 @@ tracker_search_finalize (GObject *object)
 
 	priv = TRACKER_SEARCH_GET_PRIVATE (object);
 
-	if (priv->sql_query_timeout_id != 0) {
-		g_source_remove (priv->sql_query_timeout_id);
-	}
-
-	if (priv->sql_query_iface) {
-		g_object_unref (priv->sql_query_iface);
-	}
-
 	g_object_unref (priv->email_index);
 	g_object_unref (priv->file_index);
 	g_object_unref (priv->language);
@@ -1290,80 +1278,3 @@ tracker_search_suggest (TrackerSearch	       *object,
 	tracker_dbus_request_success (request_id);
 }
 
-static gboolean 
-search_sql_iface_cleanup_cb (gpointer user_data)
-{
-	TrackerSearchPrivate *priv;
-
-	priv = TRACKER_SEARCH_GET_PRIVATE (user_data);
-
-	g_object_unref (priv->sql_query_iface);
-	priv->sql_query_iface = NULL;
-	priv->sql_query_timeout_id = 0;
-
-	return FALSE;
-}
-
-void
-tracker_search_sql_query (TrackerSearch		*object,
-			  gchar 		*query,
-			  DBusGMethodInvocation	*context,
-			  GError		**error)
-{
-	TrackerSearchPrivate *priv;
-	TrackerDBResultSet   *result_set;
-	GError 		     *actual_error = NULL;
-	guint		      request_id;
-
-	request_id = tracker_dbus_get_next_request_id ();
-
-	tracker_dbus_async_return_if_fail (query != NULL, context);
-
-	tracker_dbus_request_new (request_id,
-				  "DBus request for SQL Query, "
-				  "query:'%s'",
-				  query);
-
-	priv = TRACKER_SEARCH_GET_PRIVATE (object);
-
-	if (priv->sql_query_timeout_id != 0) {
-		g_source_remove (priv->sql_query_timeout_id);
-		priv->sql_query_timeout_id = 0;
-	}
-
-	if (priv->sql_query_iface == NULL) {
-		priv->sql_query_iface = 
-			tracker_db_manager_get_db_interfaces_ro (6,
-								 TRACKER_DB_CACHE,
-								 TRACKER_DB_COMMON,
-								 TRACKER_DB_FILE_CONTENTS,
-								 TRACKER_DB_FILE_METADATA,
-								 TRACKER_DB_EMAIL_CONTENTS,
-								 TRACKER_DB_EMAIL_METADATA);
-	}
-
-	result_set = tracker_db_interface_execute_query (priv->sql_query_iface,
-							 &actual_error,
-							 "%s",
-							 query);
-
-	if (!result_set) {
-		dbus_g_method_return_error (context, actual_error);
-		g_error_free (actual_error);
-	} else {
-		GPtrArray *values;
-
-		values = tracker_dbus_query_result_to_ptr_array (result_set);
-		dbus_g_method_return (context, values);
-		tracker_dbus_results_ptr_array_free (&values);
-		g_object_unref (result_set);
-	}
-
-	priv->sql_query_timeout_id = 
-		g_timeout_add_seconds (KEEPALIVE_TIME_FOR_SQL_QUERY, 
-				       search_sql_iface_cleanup_cb, 
-				       object);
-
-
-	tracker_dbus_request_success (request_id);
-}
diff --git a/src/trackerd/tracker-search.h b/src/trackerd/tracker-search.h
index e555a76..a0c2b7d 100644
--- a/src/trackerd/tracker-search.h
+++ b/src/trackerd/tracker-search.h
@@ -129,10 +129,6 @@ void	       tracker_search_suggest		(TrackerSearch		*object,
 						 gint			 max_dist,
 						 DBusGMethodInvocation	*context,
 						 GError		       **error);
-void	       tracker_search_sql_query		(TrackerSearch		*object,
-						 gchar 			*query,
-						 DBusGMethodInvocation	*context,
-						 GError		       **error);
 
 G_END_DECLS