[tracker/tracker-0.10] SPARQL: Add Solution helper class

[Martyn James Russell <mr src gnome org>]

commit a69f6644f69a7d98fac27fada1625c66be92d5e3
Author: JÃrg Billeter <j bitron ch>
Date:   Wed Aug 24 16:23:53 2011 +0200

    SPARQL: Add Solution helper class

 src/libtracker-data/tracker-sparql-query.vala |   26 +++++++++++++++++++-----
 1 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala
index 171922b..45c216a 100644
--- a/src/libtracker-data/tracker-sparql-query.vala
+++ b/src/libtracker-data/tracker-sparql-query.vala
@@ -167,6 +167,14 @@ namespace Tracker.Sparql {
 			base.subquery (query, parent_context);
 		}
 	}
+
+	class Solution {
+		public HashTable<string,string> hash;
+
+		public string? lookup (string variable_name) {
+			return hash.lookup (variable_name);
+		}
+	}
 }
 
 public class Tracker.Sparql.Query : Object {
@@ -702,6 +710,8 @@ public class Tracker.Sparql.Query : Object {
 
 		cursor = null;
 
+		var solution = new Solution ();
+
 		// iterate over all solutions
 		for (int i = 0; i < solutions.length; i++) {
 			// blank nodes in construct templates are per solution
@@ -711,8 +721,10 @@ public class Tracker.Sparql.Query : Object {
 
 			set_location (template_location);
 
+			solution.hash = solutions[i];
+
 			// iterate over each triple in the template
-			parse_construct_triples_block (solutions[i]);
+			parse_construct_triples_block (solution);
 
 			if (blank && update_blank_nodes != null) {
 				update_blank_nodes.add_value (blank_nodes);
@@ -721,6 +733,8 @@ public class Tracker.Sparql.Query : Object {
 			Data.update_buffer_might_flush ();
 		}
 
+		solution = null;
+
 		if (!data) {
 			// reset location to the end of the update
 			set_location (after_where);
@@ -758,7 +772,7 @@ public class Tracker.Sparql.Query : Object {
 		}
 	}
 
-	void parse_construct_triples_block (HashTable<string,string> var_value_map) throws Sparql.Error, DateError {
+	void parse_construct_triples_block (Solution var_value_map) throws Sparql.Error, DateError {
 		expect (SparqlTokenType.OPEN_BRACE);
 
 		while (current () != SparqlTokenType.CLOSE_BRACE) {
@@ -813,7 +827,7 @@ public class Tracker.Sparql.Query : Object {
 
 	bool anon_blank_node_open = false;
 
-	string? parse_construct_var_or_term (HashTable<string,string> var_value_map, out bool is_null) throws Sparql.Error, DateError {
+	string? parse_construct_var_or_term (Solution var_value_map, out bool is_null) throws Sparql.Error, DateError {
 		string result = "";
 		is_null = false;
 		if (current () == SparqlTokenType.VAR) {
@@ -900,7 +914,7 @@ public class Tracker.Sparql.Query : Object {
 		return result;
 	}
 
-	void parse_construct_property_list_not_empty (HashTable<string,string> var_value_map) throws Sparql.Error, DateError {
+	void parse_construct_property_list_not_empty (Solution var_value_map) throws Sparql.Error, DateError {
 		while (true) {
 			var old_predicate = current_predicate;
 
@@ -937,7 +951,7 @@ public class Tracker.Sparql.Query : Object {
 		}
 	}
 
-	void parse_construct_object_list (HashTable<string,string> var_value_map) throws Sparql.Error, DateError {
+	void parse_construct_object_list (Solution var_value_map) throws Sparql.Error, DateError {
 		while (true) {
 			parse_construct_object (var_value_map);
 			if (accept (SparqlTokenType.COMMA)) {
@@ -947,7 +961,7 @@ public class Tracker.Sparql.Query : Object {
 		}
 	}
 
-	void parse_construct_object (HashTable<string,string> var_value_map) throws Sparql.Error, DateError {
+	void parse_construct_object (Solution var_value_map) throws Sparql.Error, DateError {
 		bool is_null = false;
 		string object = parse_construct_var_or_term (var_value_map, out is_null);
 		if (current_subject == null || current_predicate == null || object == null) {