[tracker/tracker-store-batch: 3/3] tracker-indexer: Use new batch methods

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

commit ef658158e07ff5839f9559967c654fa890e7efaa
Author: Jürg Billeter <j bitron ch>
Date:   Tue May 12 17:59:57 2009 +0200

    tracker-indexer: Use new batch methods
    
    This will currently cause deadlocks as tracker-indexer still queries
    the database directly. We should change this to query via D-Bus.
---
 src/tracker-indexer/tracker-indexer.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/tracker-indexer/tracker-indexer.c b/src/tracker-indexer/tracker-indexer.c
index 7b78098..d267e70 100644
--- a/src/tracker-indexer/tracker-indexer.c
+++ b/src/tracker-indexer/tracker-indexer.c
@@ -351,6 +351,8 @@ flush_data (TrackerIndexer *indexer)
 		stop_transaction (indexer);
 	}
 
+	tracker_resources_batch_commit (indexer->private->client, NULL);
+
 	if ((indexer->private->state & TRACKER_INDEXER_STATE_STOPPED) == 0) {
 		signal_status (indexer, "flush");
 	}
@@ -1062,7 +1064,7 @@ item_add_or_update (TrackerIndexer        *indexer,
 			uri, sparql);
 		g_free (sparql);
 
-		tracker_resources_sparql_update (indexer->private->client, full_sparql, NULL);
+		tracker_resources_batch_sparql_update (indexer->private->client, full_sparql, NULL);
 		g_free (full_sparql);
 
 		schedule_flush (indexer, FALSE);
@@ -1075,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_resources_sparql_update (indexer->private->client, sparql, NULL);
+		tracker_resources_batch_sparql_update (indexer->private->client, sparql, NULL);
 		g_free (sparql);
 
 		schedule_flush (indexer, FALSE);
@@ -1199,7 +1201,7 @@ item_move (TrackerIndexer  *indexer,
 
 	g_string_append (sparql, " }");
 
-	tracker_resources_sparql_update (indexer->private->client, sparql->str, NULL);
+	tracker_resources_batch_sparql_update (indexer->private->client, sparql->str, NULL);
 
 #ifdef HAVE_HAL
 	if (tracker_hal_uri_is_on_removable_device (indexer->private->hal,
@@ -1286,7 +1288,7 @@ item_remove (TrackerIndexer *indexer,
 
 	/* Delete service */
 	sparql = g_strdup_printf ("DELETE { <%s> a rdfs:Resource }", uri);
-	tracker_resources_sparql_update (indexer->private->client, sparql, NULL);
+	tracker_resources_batch_sparql_update (indexer->private->client, sparql, NULL);
 	g_free (sparql);
 
 	/* TODO