AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

searchenginetracker: Quote fts match so it's seen as a single phrase

Browse Source 
FTS5 has a complex enough syntax that it makes not much sense to wrap
in simple search boxes.

https://bugzilla.gnome.org/show_bug.cgi?id=765981
This commit is contained in:
Carlos Garnacho 2016-05-04 14:23:17 +02:00
parent df38db70a0
commit 27c1cce726
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtksearchenginetracker.c
View File

@ -228,19 +228,24 @@ static void
sparql_append_string_literal (GString *sparql,
const gchar *str,
gboolean glob,
gboolean is_dir_uri)
gboolean is_dir_uri,
gboolean quoted)
{
gchar *s;
s = sparql_escape_string (str);
g_string_append_c (sparql, '"');
if (quoted)
g_string_append (sparql, "\\\"");
g_string_append (sparql, s);
if (is_dir_uri)
g_string_append_c (sparql, '/');
if (glob)
g_string_append_c (sparql, '*');
if (quoted)
g_string_append (sparql, "\\\"");
g_string_append_c (sparql, '"');
g_free (s);
@ -253,7 +258,7 @@ sparql_append_string_literal_lower_case (GString *sparql,
gchar *s;
s = g_utf8_strdown (str, -1);
sparql_append_string_literal (sparql, s, FALSE, FALSE);
sparql_append_string_literal (sparql, s, FALSE, FALSE, FALSE);
g_free (s);
}
@ -355,7 +360,7 @@ gtk_search_engine_tracker_start (GtkSearchEngine *engine)
#ifdef FTS_MATCHING
/* Using FTS: */
g_string_append (sparql, "fts:match ");
sparql_append_string_literal (sparql, search_text, TRUE, FALSE);
sparql_append_string_literal (sparql, search_text, TRUE, FALSE, TRUE);
#endif
g_string_append (sparql, ". FILTER (BOUND(nie:url(?urn)) && ");
@ -371,13 +376,13 @@ gtk_search_engine_tracker_start (GtkSearchEngine *engine)
if (recursive)
{
g_string_append (sparql, "fn:starts-with(nie:url(?urn),");
sparql_append_string_literal (sparql, location_uri, FALSE, TRUE);
sparql_append_string_literal (sparql, location_uri, FALSE, TRUE, FALSE);
g_string_append (sparql, ")");
}
else
{
g_string_append (sparql, "nie:url(?parent) = ");
sparql_append_string_literal (sparql, location_uri, FALSE, FALSE);
sparql_append_string_literal (sparql, location_uri, FALSE, FALSE, FALSE);
}
g_free (location_uri);
}