From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id A6B66431FAF for ; Tue, 25 Dec 2012 19:49:25 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WPQBA1HJ2oWd for ; Tue, 25 Dec 2012 19:49:21 -0800 (PST) Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU [18.7.68.34]) by olra.theworths.org (Postfix) with ESMTP id C2BE9431FBD for ; Tue, 25 Dec 2012 19:49:07 -0800 (PST) X-AuditID: 12074422-b7f616d000000e7c-22-50da73b3d3f3 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43]) by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP id 62.4B.03708.3B37AD05; Tue, 25 Dec 2012 22:49:07 -0500 (EST) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id qBQ3muuc025519; Tue, 25 Dec 2012 22:48:56 -0500 Received: from drake.dyndns.org (c-76-21-105-205.hsd1.ca.comcast.net [76.21.105.205]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBQ3mrI6013184 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Tue, 25 Dec 2012 22:48:55 -0500 (EST) Received: from amthrax by drake.dyndns.org with local (Exim 4.77) (envelope-from ) id 1Tnhz8-0002z2-Us; Tue, 25 Dec 2012 22:48:50 -0500 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH v2 4/5] dump/restore: Use Xapian queries for batch-tag format Date: Tue, 25 Dec 2012 22:48:42 -0500 Message-Id: <1356493723-11085-5-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1356493723-11085-1-git-send-email-amdragon@mit.edu> References: <1356493723-11085-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPIsWRmVeSWpSXmKPExsUixCmqrbu5+FaAweXt4hY3WrsZLZqmO1us nstjcf3mTGYHFo+ds+6ye9y6/5rd49mqW8weWw69Zw5gieKySUnNySxLLdK3S+DKmDRrEWvB RPWKg/e+MTcw7pTrYuTkkBAwkbi8rYUFwhaTuHBvPVsXIxeHkMA+RonVU+ezQjgbGCX+H57P BOFcZJJY3bKJGcKZyyhxeM0JsH42AQ2JbfuXM4LYIgLSEjvvzmYFsZkF8iQePtrKDmILC/hK PL3QC2azCKhKtHYcAKvhFXCQ+PfiLzPEHYoS3c8mAN3BwcEp4Cix80EdSFgIqGTiw/NMExj5 FzAyrGKUTcmt0s1NzMwpTk3WLU5OzMtLLdI11cvNLNFLTSndxAgKN3YXpR2MPw8qHWIU4GBU 4uHd8P1mgBBrYllxZe4hRkkOJiVR3u0FtwKE+JLyUyozEosz4otKc1KLDzFKcDArifA6fwQq 501JrKxKLcqHSUlzsCiJ815LuekvJJCeWJKanZpakFoEk5Xh4FCS4N1cBDRUsCg1PbUiLTOn BCHNxMEJMpwHaPhNkBre4oLE3OLMdIj8KUZFKXHeCyAJAZBERmkeXC8sHbxiFAd6RZh3D0gV DzCVwHW/AhrMBDQ4lu8GyOCSRISUVAOj1OTMWT9naDyan2DG3npbSWCClK+LwuGphhFcDWoB tWkvjV+f2usvtvL34/eu6RveLFoT3VByitFxRY6N2Z7NWaWNqVvWT+E8xZUrPn91yJRX63bP tTMpNfOYNPOc2DeHg7k8GVvvPOJ81MtxUu5+/q2e7VNi1ZdPZVhfJ3Pt+oud7N836vvfUWIp zkg01GIuKk4EABGJrjriAgAA X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Dec 2012 03:49:26 -0000 This switches the new batch-tag format away from using a home-grown hex-encoding scheme for message IDs in the dump to simply using Xapian queries with Xapian quoting syntax. This has a variety of advantages beyond presenting a cleaner and more consistent interface. Foremost is that it will dramatically simplify the quoting for batch tagging, which shares the same input format. While the hex-encoding is no better or worse for the simple ID queries used by dump/restore, it becomes onerous for general-purpose queries used in batch tagging. It also better handles strange cases like "id:foo and bar", since this is no longer syntactically valid. --- notmuch-dump.c | 9 +++++---- notmuch-restore.c | 22 ++++++++++------------ tag-util.c | 6 ------ test/dump-restore | 14 ++++++++------ 4 files changed, 23 insertions(+), 28 deletions(-) diff --git a/notmuch-dump.c b/notmuch-dump.c index 29d79da..bf01a39 100644 --- a/notmuch-dump.c +++ b/notmuch-dump.c @@ -20,6 +20,7 @@ #include "notmuch-client.h" #include "dump-restore-private.h" +#include "string-util.h" int notmuch_dump_command (unused (void *ctx), int argc, char *argv[]) @@ -141,13 +142,13 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[]) fprintf (stderr, "Error: cannot dump message id containing line break: %s\n", message_id); return 1; } - if (hex_encode (notmuch, message_id, - &buffer, &buffer_size) != HEX_SUCCESS) { - fprintf (stderr, "Error: failed to hex-encode msg-id %s\n", + if (make_boolean_term (notmuch, "id", message_id, + &buffer, &buffer_size)) { + fprintf (stderr, "Error: failed to quote message id %s\n", message_id); return 1; } - fprintf (output, " -- id:%s\n", buffer); + fprintf (output, " -- %s\n", buffer); } notmuch_message_destroy (message); diff --git a/notmuch-restore.c b/notmuch-restore.c index 9ed9b51..77a4c27 100644 --- a/notmuch-restore.c +++ b/notmuch-restore.c @@ -207,7 +207,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) INTERNAL_ERROR ("compile time constant regex failed."); do { - char *query_string; + char *query_string, *prefix, *term; if (line_ctx != NULL) talloc_free (line_ctx); @@ -220,19 +220,17 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) &query_string, tag_ops); if (ret == 0) { - if (strncmp ("id:", query_string, 3) != 0) { - fprintf (stderr, "Warning: unsupported query: %s\n", query_string); + ret = parse_boolean_term (line_ctx, query_string, + &prefix, &term); + if (ret) { + fprintf (stderr, "Warning: cannot parse query: %s\n", + query_string); + continue; + } else if (strcmp ("id", prefix) != 0) { + fprintf (stderr, "Warning: not an id query: %s\n", query_string); continue; } - /* delete id: from front of string; tag_message - * expects a raw message-id. - * - * XXX: Note that query string id:foo and bar will be - * interpreted as a message id "foo and bar". This - * should eventually be fixed to give a better error - * message. - */ - query_string = query_string + 3; + query_string = term; } } diff --git a/tag-util.c b/tag-util.c index 705b7ba..e4e5dda 100644 --- a/tag-util.c +++ b/tag-util.c @@ -124,12 +124,6 @@ parse_tag_line (void *ctx, char *line, } /* tok now points to the query string */ - if (hex_decode_inplace (tok) != HEX_SUCCESS) { - ret = line_error (TAG_PARSE_INVALID, line_for_error, - "hex decoding of query %s failed", tok); - goto DONE; - } - *query_string = tok; DONE: diff --git a/test/dump-restore b/test/dump-restore index 6a989b6..f9ae5b3 100755 --- a/test/dump-restore +++ b/test/dump-restore @@ -195,23 +195,25 @@ a # the previous line was blank; also no yelling please +%zz -- id:whatever -+e +f id:%yy ++e +f id:" ++e +f tag:abc # the next non-comment line should report an an empty tag error for # batch tagging, but not for restore + +e -- id:20091117232137.GA7669@griffis1.net -# highlight the sketchy id parsing; this should be last -+g -- id:foo and bar +# valid id, but warning about missing message ++e id:missing_message_id EOF cat < EXPECTED -Warning: unsupported query: a +Warning: cannot parse query: a Warning: no query string [+0] Warning: no query string [+a +b] Warning: missing query string [+a +b ] Warning: no query string after -- [+c +d --] Warning: hex decoding of tag %zz failed [+%zz -- id:whatever] -Warning: hex decoding of query id:%yy failed [+e +f id:%yy] -Warning: cannot apply tags to missing message: foo and bar +Warning: cannot parse query: id:" +Warning: not an id query: tag:abc +Warning: cannot apply tags to missing message: missing_message_id EOF test_expect_equal_file EXPECTED OUTPUT -- 1.7.10.4