mirror of https://github.com/djcb/mu.git
* small updates for mu_query API changes
This commit is contained in:
parent
7856ac939e
commit
ba6955be21
|
@ -123,8 +123,6 @@ run_query (MuQuery *xapian, const gchar *query, MuConfig *opts, GError **err)
|
||||||
}
|
}
|
||||||
|
|
||||||
qflags = MU_QUERY_FLAG_NONE;
|
qflags = MU_QUERY_FLAG_NONE;
|
||||||
if (opts->threads)
|
|
||||||
qflags |= MU_QUERY_FLAG_THREADS;
|
|
||||||
if (opts->reverse)
|
if (opts->reverse)
|
||||||
qflags |= MU_QUERY_FLAG_DESCENDING;
|
qflags |= MU_QUERY_FLAG_DESCENDING;
|
||||||
if (opts->skip_dups)
|
if (opts->skip_dups)
|
||||||
|
@ -574,7 +572,12 @@ output_query_results (MuMsgIter *iter, MuConfig *opts, GError **err)
|
||||||
msg = get_message (iter, opts->after);
|
msg = get_message (iter, opts->after);
|
||||||
if (!msg)
|
if (!msg)
|
||||||
break;
|
break;
|
||||||
|
/* { */
|
||||||
|
/* const char* thread_id; */
|
||||||
|
/* thread_id = mu_msg_iter_get_thread_id (iter); */
|
||||||
|
/* g_print ("%s ", thread_id ? thread_id : "<none>"); */
|
||||||
|
|
||||||
|
/* } */
|
||||||
rv = output_func (msg, iter, opts, err);
|
rv = output_func (msg, iter, opts, err);
|
||||||
if (!rv)
|
if (!rv)
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -652,7 +652,7 @@ cmd_contacts (ServerContext *ctx, GSList *args, GError **err)
|
||||||
|
|
||||||
|
|
||||||
static unsigned
|
static unsigned
|
||||||
print_sexps (MuMsgIter *iter, gboolean threads, unsigned maxnum)
|
print_sexps (MuMsgIter *iter, unsigned maxnum)
|
||||||
{
|
{
|
||||||
unsigned u;
|
unsigned u;
|
||||||
u = 0;
|
u = 0;
|
||||||
|
@ -665,8 +665,7 @@ print_sexps (MuMsgIter *iter, gboolean threads, unsigned maxnum)
|
||||||
if (mu_msg_is_readable (msg)) {
|
if (mu_msg_is_readable (msg)) {
|
||||||
char *sexp;
|
char *sexp;
|
||||||
const MuMsgIterThreadInfo* ti;
|
const MuMsgIterThreadInfo* ti;
|
||||||
|
ti = mu_msg_iter_get_thread_info (iter);
|
||||||
ti = threads ? mu_msg_iter_get_thread_info (iter) : NULL;
|
|
||||||
sexp = mu_msg_to_sexp (msg, mu_msg_iter_get_docid (iter),
|
sexp = mu_msg_to_sexp (msg, mu_msg_iter_get_docid (iter),
|
||||||
ti, MU_MSG_OPTION_HEADERS_ONLY);
|
ti, MU_MSG_OPTION_HEADERS_ONLY);
|
||||||
print_expr ("%s", sexp);
|
print_expr ("%s", sexp);
|
||||||
|
@ -863,9 +862,6 @@ get_find_params (GSList *args, MuMsgFieldId *sortfield,
|
||||||
/* flags */
|
/* flags */
|
||||||
*qflags = MU_QUERY_FLAG_NONE;
|
*qflags = MU_QUERY_FLAG_NONE;
|
||||||
|
|
||||||
if (get_bool_from_args (args, "threads", TRUE, NULL))
|
|
||||||
*qflags |= MU_QUERY_FLAG_THREADS;
|
|
||||||
|
|
||||||
/* maximum number of results */
|
/* maximum number of results */
|
||||||
maxnumstr = get_string_from_args (args, "maxnum", TRUE, NULL);
|
maxnumstr = get_string_from_args (args, "maxnum", TRUE, NULL);
|
||||||
*maxnum = maxnumstr ? atoi (maxnumstr) : 0;
|
*maxnum = maxnumstr ? atoi (maxnumstr) : 0;
|
||||||
|
@ -923,9 +919,7 @@ cmd_find (ServerContext *ctx, GSList *args, GError **err)
|
||||||
* will ensure that the output of two finds will not be
|
* will ensure that the output of two finds will not be
|
||||||
* mixed. */
|
* mixed. */
|
||||||
print_expr ("(:erase t)");
|
print_expr ("(:erase t)");
|
||||||
foundnum = print_sexps (iter,
|
foundnum = print_sexps (iter, maxnum);
|
||||||
qflags & MU_QUERY_FLAG_THREADS,
|
|
||||||
maxnum > 0 ? maxnum : G_MAXINT32);
|
|
||||||
print_expr ("(:found %u)", foundnum);
|
print_expr ("(:found %u)", foundnum);
|
||||||
mu_msg_iter_destroy (iter);
|
mu_msg_iter_destroy (iter);
|
||||||
|
|
||||||
|
|
|
@ -71,7 +71,7 @@ run_and_get_iter (const char *xpath, const char *query)
|
||||||
g_assert (query);
|
g_assert (query);
|
||||||
|
|
||||||
iter = mu_query_run (mquery, query, MU_MSG_FIELD_ID_DATE,
|
iter = mu_query_run (mquery, query, MU_MSG_FIELD_ID_DATE,
|
||||||
-1, MU_QUERY_FLAG_THREADS, NULL);
|
-1, MU_QUERY_FLAG_NONE, NULL);
|
||||||
mu_query_destroy (mquery);
|
mu_query_destroy (mquery);
|
||||||
g_assert (iter);
|
g_assert (iter);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue