update commands for new query parser

lib/mu-query.cc

@@ -173,7 +173,7 @@ struct MuProc: public Mux::ProcIface {
 	const Xapian::Database& db_;
 };
 
-class _MuQuery {
+struct _MuQuery {
 public:
 	_MuQuery (MuStore *store): _store(mu_store_ref(store)) {}
 	~_MuQuery () { mu_store_unref (_store); }

mu/Makefile.am

@@ -59,6 +59,7 @@ mu-help-strings.h: mu-help-strings.txt mu-help-strings.awk
 
 mu_LDADD=						\
 	${top_builddir}/lib/libmu.la			\
+	${top_builddir}/lib/parser/libmuxparser.la	\
 	$(GLIB_LIBS)
 
 EXTRA_DIST=						\

mu/mu-cmd-find.c

@@ -48,20 +48,26 @@ typedef gboolean (OutputFunc) (MuMsg *msg, MuMsgIter *iter,
 			       MuConfig *opts, GError **err);
 
 static gboolean
-print_xapian_query (MuQuery *xapian, const gchar *query, GError **err)
+print_internal (MuQuery *query, const gchar *expr, gboolean xapian,
+		gboolean warn, GError **err)
 {
-	char *querystr;
+	char *str;
 
-	querystr = mu_query_as_string (xapian, query, err);
+	if (xapian)
-	if (!querystr)
+		str = mu_query_internal_xapian (query, expr, err);
-		return FALSE;
+	else
+		str = mu_query_internal (query, expr, warn, err);
 
-	g_print ("%s\n", querystr);
+	if (str) {
-	g_free (querystr);
+		g_print ("%s\n", str);
+		g_free (str);
+	}
 
-	return TRUE;
+	return str != NULL;
 }
 
+
+
 /* returns MU_MSG_FIELD_ID_NONE if there is an error */
 static MuMsgFieldId
 sort_field_from_string (const char* fieldstr, GError **err)
@@ -203,7 +209,7 @@ get_query (MuConfig *opts, GError **err)
 			return NULL;
 	}
 
-	query = mu_str_quoted_from_strv ((const gchar**)&opts->params[1]);
+	query = g_strjoinv (" ", &opts->params[1]);
 	if (bookmarkval) {
 		gchar *tmp;
 		tmp = g_strdup_printf ("%s %s", bookmarkval, query);
@@ -654,7 +660,7 @@ execute_find (MuStore *store, MuConfig *opts, GError **err)
 	MuQuery		*oracle;
 	gboolean	 rv;
 
-	oracle = get_query_obj(store, err);
+	oracle = get_query_obj (store, err);
 	if (!oracle)
 		return FALSE;
 
@@ -665,7 +671,10 @@ execute_find (MuStore *store, MuConfig *opts, GError **err)
 	}
 
 	if (opts->format == MU_CONFIG_FORMAT_XQUERY)
-		rv = print_xapian_query (oracle, query_str, err);
+		rv = print_internal (oracle, query_str, TRUE, FALSE, err);
+	else if (opts->format == MU_CONFIG_FORMAT_MQUERY)
+		rv = print_internal (oracle, query_str, FALSE,
+				     opts->verbose, err);
 	else
 		rv = process_query (oracle, query_str, opts, err);
 
@@ -687,6 +696,7 @@ format_params_valid (MuConfig *opts, GError **err)
 	case MU_CONFIG_FORMAT_LINKS:
 	case MU_CONFIG_FORMAT_XML:
 	case MU_CONFIG_FORMAT_XQUERY:
+	case MU_CONFIG_FORMAT_MQUERY:
 		if (opts->exec) {
 			mu_util_g_set_error
 				(err, MU_ERROR_IN_PARAMETERS,

mu/mu-cmd-server.c

@@ -275,7 +275,7 @@ get_docid_from_msgid (MuQuery *query, const char *str, GError **err)
 	unsigned docid;
 	MuMsgIter *iter;
 
-	querystr = g_strdup_printf ("msgid:\"%s\"", str);
+	querystr = g_strdup_printf ("msgid:%s", str);
 	iter = mu_query_run (query, querystr,
 			     MU_MSG_FIELD_ID_NONE,
 			     1, MU_QUERY_FLAG_NONE, err);
@@ -310,7 +310,7 @@ get_docids_from_msgids (MuQuery *query, const char *str, GError **err)
 	MuMsgIter *iter;
 	GSList *lst;
 
-	querystr = g_strdup_printf ("msgid:\"%s\"", str);
+	querystr = g_strdup_printf ("msgid:%s", str);
 	iter = mu_query_run (query, querystr, MU_MSG_FIELD_ID_NONE,
 			     -1 /*unlimited*/, MU_QUERY_FLAG_NONE,
 			     err);
@@ -360,7 +360,6 @@ determine_docid (MuQuery *query, GHashTable *args, GError **err)
 }
 
 
-
 #define DOCID_VALID_OR_ERROR_RETURN(DOCID,E)				\
 	if ((DOCID)==MU_STORE_INVALID_DOCID) {				\
 		mu_util_g_set_error((E),MU_ERROR_IN_PARAMETERS,		\

mu/mu-config.c

@@ -52,7 +52,8 @@ get_output_format (const char *formatstr)
 		{"plain",	MU_CONFIG_FORMAT_PLAIN},
 		{"sexp",	MU_CONFIG_FORMAT_SEXP},
 		{"xml",		MU_CONFIG_FORMAT_XML},
-		{"xquery",	MU_CONFIG_FORMAT_XQUERY}
+		{"xquery",	MU_CONFIG_FORMAT_XQUERY},
+		{"mquery",	MU_CONFIG_FORMAT_MQUERY}
 	};
 
 	for (i = 0; i != G_N_ELEMENTS(formats); i++)

mu/mu-config.h

@@ -1,7 +1,7 @@
 /* -*-mode: c; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-*/
 
 /*
-** Copyright (C) 2008-2013 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
+** Copyright (C) 2008-2017 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 **
 ** This program is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by the
@@ -55,6 +55,7 @@ enum _MuConfigFormat {
 	MU_CONFIG_FORMAT_LINKS,		/* output as symlinks */
 	MU_CONFIG_FORMAT_XML,		/* output xml */
 	MU_CONFIG_FORMAT_XQUERY,	/* output the xapian query */
+	MU_CONFIG_FORMAT_MQUERY,	/* output the mux query */
 
 	MU_CONFIG_FORMAT_EXEC		/* execute some command */
 };
@@ -166,7 +167,6 @@ struct _MuConfig {
 					   * multiple messages in mu
 					   * view */
 
-
 	/* options for cfind (and 'find' --> "after") */
 	gboolean          personal;       /* only show 'personal' addresses */
 	/* also 'after' --> see above */
@@ -227,7 +227,6 @@ void mu_config_uninit (MuConfig *conf);
  */
 MuError mu_config_execute (MuConfig *conf);
 
-
 /**
  * count the number of non-option parameters
  *