[tracker/libtracker-sparql-porting: 32/34] Adapt to libtracker-sparql changes

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

commit 58e11c53bf64635f5383f9c91f27167cea73540d
Author: Jürg Billeter <j bitron ch>
Date:   Tue Aug 10 17:01:48 2010 +0200

    Adapt to libtracker-sparql changes

 src/tracker-control/tracker-control.c |    4 +++-
 src/tracker-utils/tracker-import.c    |    2 +-
 src/tracker-utils/tracker-sparql.c    |    2 +-
 src/tracker-utils/tracker-tag.c       |    6 +++---
 tests/tracker-steroids/tracker-test.c |   18 +++++++++---------
 5 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/src/tracker-control/tracker-control.c b/src/tracker-control/tracker-control.c
index 3efe871..464e6e8 100644
--- a/src/tracker-control/tracker-control.c
+++ b/src/tracker-control/tracker-control.c
@@ -33,7 +33,9 @@
 #include <glib/gstdio.h>
 
 #include <libtracker-common/tracker-common.h>
-#include <libtracker-data/tracker-data.h>
+#include <libtracker-data/tracker-db-config.h>
+#include <libtracker-data/tracker-db-journal.h>
+#include <libtracker-data/tracker-db-manager.h>
 #include <libtracker-miner/tracker-miner.h>
 
 #include "tracker-miner-files-reindex-client.h"
diff --git a/src/tracker-utils/tracker-import.c b/src/tracker-utils/tracker-import.c
index e099f75..682ced4 100644
--- a/src/tracker-utils/tracker-import.c
+++ b/src/tracker-utils/tracker-import.c
@@ -127,7 +127,7 @@ main (int argc, char **argv)
 		         *p);
 
 		file = g_file_new_for_commandline_arg (*p);
-		tracker_sparql_connection_import (connection, file, NULL, &error);
+		tracker_sparql_connection_load (connection, file, NULL, &error);
 		g_object_unref (file);
 
 		if (error) {
diff --git a/src/tracker-utils/tracker-sparql.c b/src/tracker-utils/tracker-sparql.c
index 5fcba98..7b17975 100644
--- a/src/tracker-utils/tracker-sparql.c
+++ b/src/tracker-utils/tracker-sparql.c
@@ -505,7 +505,7 @@ main (int argc, char **argv)
 
 	if (query) {
 		if (G_UNLIKELY (update)) {
-			tracker_sparql_connection_update (connection, query, NULL, &error);
+			tracker_sparql_connection_update (connection, query, 0, NULL, &error);
 
 			if (error) {
 				g_printerr ("%s, %s\n",
diff --git a/src/tracker-utils/tracker-tag.c b/src/tracker-utils/tracker-tag.c
index 2fa8025..f7ece4f 100644
--- a/src/tracker-utils/tracker-tag.c
+++ b/src/tracker-utils/tracker-tag.c
@@ -597,7 +597,7 @@ add_tag_for_urns (TrackerSparqlConnection *connection,
 					 tag_escaped);
 	}
 
-	tracker_sparql_connection_update (connection, query, NULL, &error);
+	tracker_sparql_connection_update (connection, query, 0, NULL, &error);
 	g_free (query);
 
 	if (error) {
@@ -645,7 +645,7 @@ add_tag_for_urns (TrackerSparqlConnection *connection,
 		                         tag_escaped,
 		                         filter);
 
-		tracker_sparql_connection_update (connection, query, NULL, &error);
+		tracker_sparql_connection_update (connection, query, 0, NULL, &error);
 		g_strfreev (urns_strv);
 		g_free (filter);
 		g_free (query);
@@ -775,7 +775,7 @@ remove_tag_for_urns (TrackerSparqlConnection *connection,
 
 	g_free (tag_escaped);
 
-	tracker_sparql_connection_update (connection, query, NULL, &error);
+	tracker_sparql_connection_update (connection, query, 0, NULL, &error);
 	g_free (query);
 
 	if (error) {
diff --git a/tests/tracker-steroids/tracker-test.c b/tests/tracker-steroids/tracker-test.c
index a4c0afb..a9c62d3 100644
--- a/tests/tracker-steroids/tracker-test.c
+++ b/tests/tracker-steroids/tracker-test.c
@@ -56,10 +56,10 @@ insert_test_data ()
 	                                "    <urn:testdata4> a nmm:Photo ; nao:identifier \"%s\" ."
 	                                "}", longName);
 
-	tracker_sparql_connection_update (connection, delete_query, NULL, &error);
+	tracker_sparql_connection_update (connection, delete_query, 0, NULL, &error);
 	g_assert (!error);
 
-	tracker_sparql_connection_update (connection, filled_query, NULL, &error);
+	tracker_sparql_connection_update (connection, filled_query, 0, NULL, &error);
 	g_assert (!error);
 
 	g_free (filled_query);
@@ -260,7 +260,7 @@ test_tracker_sparql_update_fast_small ()
 	GError *error = NULL;
 	const gchar *query = "INSERT { _:x a nmo:Message }";
 
-	tracker_sparql_connection_update (connection, query, NULL, &error);
+	tracker_sparql_connection_update (connection, query, 0, NULL, &error);
 
 	g_assert (!error);
 
@@ -280,7 +280,7 @@ test_tracker_sparql_update_fast_large ()
 
 	query = g_strdup_printf ("INSERT { _:x a nmo:Message; nao:identifier \"%s\" }", lotsOfA);
 
-	tracker_sparql_connection_update (connection, query, NULL, &error);
+	tracker_sparql_connection_update (connection, query, 0, NULL, &error);
 
 	g_free (lotsOfA);
 	g_free (query);
@@ -296,7 +296,7 @@ test_tracker_sparql_update_fast_error ()
 	GError *error = NULL;
 	const gchar *query = "blork blork blork";
 
-	tracker_sparql_connection_update (connection, query, NULL, &error);
+	tracker_sparql_connection_update (connection, query, 0, NULL, &error);
 
 	g_assert (error);
 	g_error_free (error);
@@ -311,7 +311,7 @@ test_tracker_sparql_update_blank_fast_small ()
 	const gchar *query = "INSERT { _:x a nmo:Message }";
 	GVariant *results;
 
-	results = tracker_sparql_connection_update_blank (connection, query, NULL, &error);
+	results = tracker_sparql_connection_update_blank (connection, query, 0, NULL, &error);
 
 	g_assert (!error);
 	g_assert (results);
@@ -335,7 +335,7 @@ test_tracker_sparql_update_blank_fast_large ()
 
 	query = g_strdup_printf ("INSERT { _:x a nmo:Message; nao:identifier \"%s\" }", lotsOfA);
 
-	results = tracker_sparql_connection_update_blank (connection, query, NULL, &error);
+	results = tracker_sparql_connection_update_blank (connection, query, 0, NULL, &error);
 
 	g_free (lotsOfA);
 	g_free (query);
@@ -355,7 +355,7 @@ test_tracker_sparql_update_blank_fast_error ()
 	const gchar *query = "blork blork blork";
 	GVariant *results;
 
-	results = tracker_sparql_connection_update_blank (connection, query, NULL, &error);
+	results = tracker_sparql_connection_update_blank (connection, query, 0, NULL, &error);
 
 	g_assert (error);
 	g_assert (!results);
@@ -372,7 +372,7 @@ test_tracker_sparql_update_blank_fast_no_blanks ()
 	const gchar *query = "INSERT { <urn:not_blank> a nmo:Message }";
 	GVariant *results;
 
-	results = tracker_sparql_connection_update_blank (connection, query, NULL, &error);
+	results = tracker_sparql_connection_update_blank (connection, query, 0, NULL, &error);
 
 	/* FIXME: Properly test once we get update_blank implemented */