[tracker/tracker-store] tracker-indexer: Send SPARQL Update queries via D-Bus

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

commit 9a88c79c6d3fc918c4190c5f4c8e67a17b1eb0e4
Author: Jürg Billeter <j bitron ch>
Date:   Tue May 5 13:04:07 2009 +0200

    tracker-indexer: Send SPARQL Update queries via D-Bus
---
 src/tracker-indexer/Makefile.am       |    1 +
 src/tracker-indexer/tracker-indexer.c |   16 ++++++++++++----
 tests/tracker-indexer/Makefile.am     |    1 +
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/tracker-indexer/Makefile.am b/src/tracker-indexer/Makefile.am
index c4a3a47..51c01cf 100644
--- a/src/tracker-indexer/Makefile.am
+++ b/src/tracker-indexer/Makefile.am
@@ -62,6 +62,7 @@ tracker_indexer_LDADD =							\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
 	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
+	$(top_builddir)/src/libtracker/libtrackerclient- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libstemmer/libstemmer.la	 		\
 	$(trackerd_win_libs)						\
 	$(DBUS_LIBS)							\
diff --git a/src/tracker-indexer/tracker-indexer.c b/src/tracker-indexer/tracker-indexer.c
index 76a0939..034932d 100644
--- a/src/tracker-indexer/tracker-indexer.c
+++ b/src/tracker-indexer/tracker-indexer.c
@@ -139,6 +139,8 @@ struct TrackerIndexerPrivate {
 
 	TrackerHal *hal;
 
+	TrackerClient *client;
+
 	GTimer *timer;
 
 	GVolumeMonitor *volume_monitor;
@@ -569,6 +571,10 @@ tracker_indexer_finalize (GObject *object)
 	g_object_unref (priv->hal);
 #endif /* HAVE_HAL */
 
+	if (priv->client) {
+		tracker_disconnect (priv->client);
+	}
+
 	g_object_unref (priv->language);
 	g_object_unref (priv->config);
 
@@ -901,6 +907,8 @@ tracker_indexer_init (TrackerIndexer *indexer)
 	priv->modules_queue = g_queue_new ();
 	priv->config = tracker_config_new ();
 
+	priv->client = tracker_connect (TRUE);
+
 #ifdef HAVE_HAL
 	priv->hal = tracker_hal_new ();
 
@@ -1056,7 +1064,7 @@ item_add_or_update (TrackerIndexer        *indexer,
 			uri, sparql);
 		g_free (sparql);
 
-		tracker_data_update_sparql (full_sparql, NULL);
+		tracker_resources_sparql_update (indexer->private->client, full_sparql, NULL);
 		g_free (full_sparql);
 
 		schedule_flush (indexer, FALSE);
@@ -1069,7 +1077,7 @@ item_add_or_update (TrackerIndexer        *indexer,
 		item_add_to_datasource (indexer, uri, info->module_file, metadata);
 
 		sparql = tracker_module_metadata_get_sparql (metadata);
-		tracker_data_update_sparql (sparql, NULL);
+		tracker_resources_sparql_update (indexer->private->client, sparql, NULL);
 		g_free (sparql);
 
 		schedule_flush (indexer, FALSE);
@@ -1193,7 +1201,7 @@ item_move (TrackerIndexer  *indexer,
 
 	g_string_append (sparql, " }");
 
-	tracker_data_update_sparql (sparql->str, NULL);
+	tracker_resources_sparql_update (indexer->private->client, sparql->str, NULL);
 
 #ifdef HAVE_HAL
 	if (tracker_hal_uri_is_on_removable_device (indexer->private->hal,
@@ -1276,7 +1284,7 @@ item_remove (TrackerIndexer *indexer,
 
 	/* Delete service */
 	sparql = g_strdup_printf ("DELETE { <%s> a rdfs:Resource }", uri);
-	tracker_data_update_sparql (sparql, NULL);
+	tracker_resources_sparql_update (indexer->private->client, sparql, NULL);
 	g_free (sparql);
 
 	/* TODO
diff --git a/tests/tracker-indexer/Makefile.am b/tests/tracker-indexer/Makefile.am
index 2600a2c..d2f684e 100644
--- a/tests/tracker-indexer/Makefile.am
+++ b/tests/tracker-indexer/Makefile.am
@@ -43,6 +43,7 @@ tracker_metadata_utils_LDADD =	                                        	\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la 			\
 	$(top_builddir)/src/libtracker-db/libtracker-db.la 			\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 		\
+	$(top_builddir)/src/libtracker/libtrackerclient- TRACKER_API_VERSION@.la \
 	$(top_builddir)/tests/common/libtracker-testcommon.la           	\
 	$(DBUS_LIBS)								\
 	$(PANGO_LIBS)								\