diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2020-03-03 09:45:42 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam@afuera.me.uk> | 2020-03-03 09:45:42 +0000 |
| commit | 5b720cd2dd7cc32a845e71ba3385b163a59fe80f (patch) | |
| tree | 903a194fab2b461b57e0a2800b760021ba0c1fdc | |
| parent | 63736da59ac0d676cac4a78bd49ca2577dd1b486 (diff) | |
| parent | c64e343511a4a68892e9b6f683cc5faae17f1b1b (diff) | |
| download | tracker-5b720cd2dd7cc32a845e71ba3385b163a59fe80f.tar.gz | |
Merge branch 'wip/carlosg/fixes' into 'master'
Random fixes
See merge request GNOME/tracker!191
| -rw-r--r-- | src/libtracker-fts/tracker-fts-tokenizer.c | 14 | ||||
| -rw-r--r-- | src/libtracker-sparql/tracker-endpoint-dbus.c | 8 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/libtracker-fts/tracker-fts-tokenizer.c b/src/libtracker-fts/tracker-fts-tokenizer.c index a6244af9d..40cfabf74 100644 --- a/src/libtracker-fts/tracker-fts-tokenizer.c +++ b/src/libtracker-fts/tracker-fts-tokenizer.c @@ -220,6 +220,8 @@ tracker_offsets_function (const Fts5ExtensionApi *api, int phrase, col, n_token; rc = api->xInst (fts_ctx, i, &phrase, &col, &n_token); + if (rc != SQLITE_OK) + break; if (first || cur_col != col) { const char *text; @@ -229,9 +231,15 @@ tracker_offsets_function (const Fts5ExtensionApi *api, g_array_free (offsets, TRUE); offsets = g_array_new (FALSE, FALSE, sizeof (gint)); - api->xColumnText (fts_ctx, col, &text, &length); - api->xTokenize (fts_ctx, text, length, - offsets, &offsets_tokenizer_func); + rc = api->xColumnText (fts_ctx, col, &text, &length); + if (rc != SQLITE_OK) + break; + + rc = api->xTokenize (fts_ctx, text, length, + offsets, &offsets_tokenizer_func); + if (rc != SQLITE_OK) + break; + cur_col = col; } diff --git a/src/libtracker-sparql/tracker-endpoint-dbus.c b/src/libtracker-sparql/tracker-endpoint-dbus.c index 1668aa97e..6e977e746 100644 --- a/src/libtracker-sparql/tracker-endpoint-dbus.c +++ b/src/libtracker-sparql/tracker-endpoint-dbus.c @@ -442,11 +442,11 @@ create_statement (TrackerSparqlConnection *conn, tracker_sparql_statement_bind_double (stmt, arg, g_variant_get_double (value)); } else if (g_variant_is_of_type (value, G_VARIANT_TYPE_INT64)) { - tracker_sparql_statement_bind_double (stmt, arg, - g_variant_get_int64 (value)); + tracker_sparql_statement_bind_int (stmt, arg, + g_variant_get_int64 (value)); } else if (g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN)) { - tracker_sparql_statement_bind_double (stmt, arg, - g_variant_get_boolean (value)); + tracker_sparql_statement_bind_boolean (stmt, arg, + g_variant_get_boolean (value)); } else { g_warning ("Unhandled type '%s' for argument %s", g_variant_get_type_string (value), |