* remove mu_query_xapian_combine; let Xapian handle it. add

mu_util_str_from_strv for combining strings
This commit is contained in:
Dirk-Jan C. Binnema
2010-02-03 21:06:31 +02:00
parent a2d1692dda
commit fa08d66380
5 changed files with 59 additions and 83 deletions

View File

@ -247,15 +247,14 @@ run_query (MuQueryXapian *xapian, const gchar *query, MuConfigOptions *opts)
}
static gboolean
do_output (MuQueryXapian *xapian, MuConfigOptions* opts,
const gchar **params)
const gchar **params)
{
gchar *query;
gboolean retval = TRUE;
query = mu_query_xapian_combine (params, FALSE);
query = mu_util_str_from_strv (params);
/* if xquery is set, we print the xapian query instead of the
* output; this is for debugging purposes */
@ -265,13 +264,11 @@ do_output (MuQueryXapian *xapian, MuConfigOptions* opts,
retval = run_query (xapian, query, opts);
g_free (query);
return retval;
}
static gboolean
query_params_valid (MuConfigOptions *opts)
{