[tracker/subqueries-for-master: 11/14] SPARQL: Add add_variable_binding method to simplify code

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

commit e435d829caaf20808133d551a9918785189f9621
Author: Jürg Billeter <j bitron ch>
Date:   Tue Dec 8 21:07:05 2009 +0100

    SPARQL: Add add_variable_binding method to simplify code

 src/libtracker-data/tracker-sparql-query.vala |   79 +++++++++----------------
 1 files changed, 28 insertions(+), 51 deletions(-)
---
diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala
index f085646..48db214 100644
--- a/src/libtracker-data/tracker-sparql-query.vala
+++ b/src/libtracker-data/tracker-sparql-query.vala
@@ -2478,6 +2478,25 @@ public class Tracker.SparqlQuery : Object {
 		subgraph_var_set = old_subgraph_var_set;
 	}
 
+	void add_variable_binding (StringBuilder sql, VariableBinding binding, VariableState variable_state) {
+		var binding_list = pattern_var_map.lookup (binding.variable);
+		if (binding_list == null) {
+			binding_list = new VariableBindingList ();
+			pattern_variables.append (binding.variable);
+			pattern_var_map.insert (binding.variable, binding_list);
+
+			sql.append_printf ("%s AS %s, ",
+				binding.sql_expression,
+				binding.variable.sql_expression);
+
+			subgraph_var_set.insert (binding.variable, variable_state);
+		}
+		binding_list.list.append (binding);
+		if (binding.variable.binding == null) {
+			binding.variable.binding = binding;
+		}
+	}
+
 	void parse_object (StringBuilder sql, bool in_simple_optional = false) throws SparqlError {
 		bool object_is_var;
 		string object = parse_var_or_term (sql, out object_is_var);
@@ -2599,22 +2618,8 @@ public class Tracker.SparqlQuery : Object {
 			binding.variable = get_variable (current_predicate);
 			binding.table = table;
 			binding.sql_db_column_name = "predicate";
-			var binding_list = pattern_var_map.lookup (binding.variable);
-			if (binding_list == null) {
-				binding_list = new VariableBindingList ();
-				pattern_variables.append (binding.variable);
-				pattern_var_map.insert (binding.variable, binding_list);
-
-				sql.append_printf ("%s AS %s, ",
-					binding.sql_expression,
-					binding.variable.sql_expression);
 
-				subgraph_var_set.insert (binding.variable, VariableState.BOUND);
-			}
-			binding_list.list.append (binding);
-			if (binding.variable.binding == null) {
-				binding.variable.binding = binding;
-			}
+			add_variable_binding (sql, binding, VariableState.BOUND);
 		}
 		
 		if (newtable) {
@@ -2629,22 +2634,8 @@ public class Tracker.SparqlQuery : Object {
 				} else {
 					binding.sql_db_column_name = "ID";
 				}
-				var binding_list = pattern_var_map.lookup (binding.variable);
-				if (binding_list == null) {
-					binding_list = new VariableBindingList ();
-					pattern_variables.append (binding.variable);
-					pattern_var_map.insert (binding.variable, binding_list);
 
-					sql.append_printf ("%s AS %s, ",
-						binding.sql_expression,
-						binding.variable.sql_expression);
-
-					subgraph_var_set.insert (binding.variable, VariableState.BOUND);
-				}
-				binding_list.list.append (binding);
-				if (binding.variable.binding == null) {
-					binding.variable.binding = binding;
-				}
+				add_variable_binding (sql, binding, VariableState.BOUND);
 			} else {
 				var binding = new LiteralBinding ();
 				binding.data_type = PropertyType.RESOURCE;
@@ -2679,28 +2670,14 @@ public class Tracker.SparqlQuery : Object {
 					binding.maybe_null = true;
 				}
 
-				var binding_list = pattern_var_map.lookup (binding.variable);
-				if (binding_list == null) {
-					binding_list = new VariableBindingList ();
-					pattern_variables.append (binding.variable);
-					pattern_var_map.insert (binding.variable, binding_list);
-
-					sql.append_printf ("%s AS %s, ",
-						binding.sql_expression,
-						binding.variable.sql_expression);
-
-					VariableState state;
-					if (in_simple_optional) {
-						state = VariableState.OPTIONAL;
-					} else {
-						state = VariableState.BOUND;
-					}
-					subgraph_var_set.insert (binding.variable, state);
-				}
-				binding_list.list.append (binding);
-				if (binding.variable.binding == null) {
-					binding.variable.binding = binding;
+				VariableState state;
+				if (in_simple_optional) {
+					state = VariableState.OPTIONAL;
+				} else {
+					state = VariableState.BOUND;
 				}
+
+				add_variable_binding (sql, binding, state);
 			} else if (is_fts_match) {
 				var binding = new LiteralBinding ();
 				binding.is_fts_match = true;