[tracker/wip/carlosg/fix-disable-fts] libtracker-data: Fix build with -Dfts=false



commit 8ed5587e76fb42dd428d592f5540280849abe761
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Sep 22 13:15:43 2019 +0200

    libtracker-data: Fix build with -Dfts=false
    
    This broke alongside the refactors and updates to handle sparql1.1.
    
    Closes: https://gitlab.gnome.org/GNOME/tracker/issues/143

 src/libtracker-data/tracker-data-manager.c | 4 ++++
 src/libtracker-data/tracker-data-update.c  | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 70c7a2845..fbd43d86c 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -4907,8 +4907,10 @@ tracker_data_manager_initable_init (GInitable     *initable,
                                        g_hash_table_iter_init (&iter, graphs);
 
                                        while (g_hash_table_iter_next (&iter, &value, NULL)) {
+#if HAVE_TRACKER_FTS
                                                if (update_fts)
                                                        tracker_db_interface_sqlite_fts_delete_table (iface, 
value);
+#endif
 
                                                tracker_data_ontology_setup_db (manager, iface, value, TRUE,
                                                                                &ontology_error);
@@ -5291,7 +5293,9 @@ tracker_data_manager_create_graph (TrackerDataManager  *manager,
                                             FALSE, error))
                goto detach;
 
+#if HAVE_TRACKER_FTS
        tracker_data_manager_init_fts (manager, iface, name, TRUE);
+#endif
 
        id = tracker_data_ensure_graph (manager->data_update, name, error);
        if (id == 0)
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index 86679cea5..65e9d8306 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -1368,10 +1368,12 @@ get_old_property_values (TrackerData      *data,
                          GError          **error)
 {
        GArray *old_values;
+#if HAVE_TRACKER_FTS
        const gchar *database;
 
        database = data->resource_buffer->graph->graph ?
                data->resource_buffer->graph->graph : "main";
+#endif
 
        /* read existing property values */
        old_values = g_hash_table_lookup (data->resource_buffer->predicates, property);
@@ -2751,9 +2753,7 @@ tracker_data_update_statement_with_string (TrackerData  *data,
        TrackerDBInterface *iface;
        GValue object_value = G_VALUE_INIT;
        const gchar *object_str;
-#if HAVE_TRACKER_FTS
        GError *new_error = NULL;
-#endif /* HAVE_TRACKER_FTS */
 
        g_return_if_fail (subject != NULL);
        g_return_if_fail (predicate != NULL);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]