[tracker/wip/carlosg/anonymous-nodes: 33/56] libtracker-data: Minor refactor

[Carlos Garnacho <carlosg src gnome org>]

commit 2d5a14c6cab15aaeb7fa07ddd8e6600969be2503
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Sep 19 12:44:48 2021 +0200

    libtracker-data: Minor refactor
    
    There is a small pattern here, move it to a separate function.

 src/libtracker-data/tracker-sparql.c | 62 ++++++++++++++----------------------
 1 file changed, 24 insertions(+), 38 deletions(-)
---
diff --git a/src/libtracker-data/tracker-sparql.c b/src/libtracker-data/tracker-sparql.c
index f6d42228a..0662ddef2 100644
--- a/src/libtracker-data/tracker-sparql.c
+++ b/src/libtracker-data/tracker-sparql.c
@@ -6868,29 +6868,39 @@ translate_TriplesNode (TrackerSparql  *sparql,
        return TRUE;
 }
 
-static gboolean
-translate_BlankNodePropertyList (TrackerSparql  *sparql,
-                                 GError        **error)
+static void
+tracker_sparql_generate_bnode (TrackerSparql *sparql,
+                               TrackerToken  *token)
 {
-       TrackerToken old_subject = sparql->current_state->subject;
-       TrackerVariable *var;
-
-       /* BlankNodePropertyList ::= '[' PropertyListNotEmpty ']'
-        */
-       _expect (sparql, RULE_TYPE_LITERAL, LITERAL_OPEN_BRACKET);
+       if (sparql->current_state->type == TRACKER_SPARQL_TYPE_SELECT ||
+           sparql->current_state->type == TRACKER_SPARQL_TYPE_CONSTRUCT) {
+               TrackerVariable *var;
 
-        if (sparql->current_state->type == TRACKER_SPARQL_TYPE_SELECT) {
                var = tracker_select_context_add_generated_variable (TRACKER_SELECT_CONTEXT 
(sparql->context));
-               tracker_token_variable_init (&sparql->current_state->subject, var);
+               tracker_token_variable_init (token, var);
        } else {
                TrackerDBInterface *iface;
                gchar *bnode_id;
 
                iface = tracker_data_manager_get_writable_db_interface (sparql->data_manager);
                bnode_id = tracker_data_query_unused_uuid (sparql->data_manager, iface);
-               tracker_token_literal_init (&sparql->current_state->subject, bnode_id, -1);
+               tracker_token_literal_init (token, bnode_id, -1);
                g_free (bnode_id);
        }
+}
+
+static gboolean
+translate_BlankNodePropertyList (TrackerSparql  *sparql,
+                                 GError        **error)
+{
+       TrackerToken old_subject = sparql->current_state->subject;
+
+       /* BlankNodePropertyList ::= '[' PropertyListNotEmpty ']'
+        */
+       _expect (sparql, RULE_TYPE_LITERAL, LITERAL_OPEN_BRACKET);
+
+       tracker_sparql_generate_bnode (sparql,
+                                      &sparql->current_state->subject);
 
        _call_rule (sparql, NAMED_RULE_PropertyListNotEmpty, error);
 
@@ -6983,19 +6993,7 @@ translate_Collection (TrackerSparql  *sparql,
                        g_array_set_size (elems, elems->len + 1);
                        cur = &g_array_index (elems, TrackerToken, 0);
 
-                       if (sparql->current_state->type == TRACKER_SPARQL_TYPE_SELECT) {
-                               TrackerVariable *var;
-                               var = tracker_select_context_add_generated_variable (TRACKER_SELECT_CONTEXT 
(sparql->context));
-                               tracker_token_variable_init (cur, var);
-                       } else {
-                               TrackerDBInterface *iface;
-                               gchar *bnode_id;
-
-                               iface = tracker_data_manager_get_writable_db_interface (sparql->data_manager);
-                               bnode_id = tracker_data_query_unused_uuid (sparql->data_manager, iface);
-                               tracker_token_literal_init (cur, bnode_id, -1);
-                               g_free (bnode_id);
-                       }
+                       tracker_sparql_generate_bnode (sparql, cur);
                }
 
                sparql->current_state->subject = *cur;
@@ -7029,19 +7027,7 @@ translate_Collection (TrackerSparql  *sparql,
                        g_array_set_size (elems, elems->len + 1);
                        cur = &g_array_index (elems, TrackerToken, elems->len - 1);
 
-                       if (sparql->current_state->type == TRACKER_SPARQL_TYPE_SELECT) {
-                               TrackerVariable *var;
-                               var = tracker_select_context_add_generated_variable (TRACKER_SELECT_CONTEXT 
(sparql->context));
-                               tracker_token_variable_init (cur, var);
-                       } else {
-                               TrackerDBInterface *iface;
-                               gchar *bnode_id;
-
-                               iface = tracker_data_manager_get_writable_db_interface (sparql->data_manager);
-                               bnode_id = tracker_data_query_unused_uuid (sparql->data_manager, iface);
-                               tracker_token_literal_init (cur, bnode_id, -1);
-                               g_free (bnode_id);
-                       }
+                       tracker_sparql_generate_bnode (sparql, cur);
 
                        sparql->current_state->object = *cur;