[tracker/async-queries-cursor] libtracker-data: Code reuse

[Philip Van Hoof <pvanhoof src gnome org>]

commit bc4c5762d44e27d4585663c628a6bb6172f74756
Author: Philip Van Hoof <philip codeminded be>
Date:   Mon Apr 19 16:38:25 2010 +0200

    libtracker-data: Code reuse

 src/libtracker-data/tracker-sparql-query.vala |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala
index 9732dc0..0215d95 100644
--- a/src/libtracker-data/tracker-sparql-query.vala
+++ b/src/libtracker-data/tracker-sparql-query.vala
@@ -361,7 +361,7 @@ public class Tracker.Sparql.Query : Object {
 		}
 	}
 
-	public DBResultSet? execute () throws DBInterfaceError, SparqlError, DateError {
+	void prepare_execute () throws DBInterfaceError, SparqlError, DateError {
 		assert (!update_extensions);
 
 		scanner = new SparqlScanner ((char*) query_string, (long) query_string.size ());
@@ -375,6 +375,11 @@ public class Tracker.Sparql.Query : Object {
 		}
 
 		parse_prologue ();
+	}
+
+	public DBResultSet? execute () throws DBInterfaceError, SparqlError, DateError {
+
+		prepare_execute ();
 
 		switch (current ()) {
 		case SparqlTokenType.SELECT:
@@ -396,19 +401,8 @@ public class Tracker.Sparql.Query : Object {
 
 
 	public DBCursor? execute_cursor () throws DBInterfaceError, SparqlError, DateError {
-		assert (!update_extensions);
-
-		scanner = new SparqlScanner ((char*) query_string, (long) query_string.size ());
-		next ();
 
-		// declare fn prefix for XPath functions
-		prefix_map.insert ("fn", FN_NS);
-
-		foreach (Namespace ns in Ontologies.get_namespaces ()) {
-			prefix_map.insert (ns.prefix, ns.uri);
-		}
-
-		parse_prologue ();
+		prepare_execute ();
 
 		switch (current ()) {
 		case SparqlTokenType.SELECT: