emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* mu-query-xapian: escape AND/OR/NOT in query element lists

This commit is contained in:
Dirk-Jan C. Binnema 2009-12-07 00:22:42 +02:00
parent 4ff5878eca
commit 3f37abaed3
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mu-query-xapian.cc
View File

@ -195,11 +195,26 @@ mu_query_xapian_combine (GSList *lst, gboolean connect_or)
str = g_string_sized_new (64); /* just a guess */
while (lst) {
const char* elm;
const char* cnx = "";
gboolean do_quote;
elm = (const gchar*)lst->data;
if (!elm) /* shouldn't happen */
break;
if (lst->next)
cnx = connect_or ? " OR " : " AND ";
do_quote = (strcasecmp (elm, "OR") == 0 ||
strcasecmp (elm, "AND") == 0 ||
strcasecmp (elm, "NOT") == 0);
g_string_append_printf (str, "%s%s", (gchar*)lst->data, cnx);
g_string_append_printf (str, "%s%s%s%s",
do_quote ? "\"" : "",
(gchar*)lst->data,
do_quote ? "\"" : "",
cnx);
lst = lst->next;
}