[WIP patch 3/9] lib: add and test function to retrive current key

diff --git a/6e/2050044a794d091cb4101705254baf987e0016 b/6e/2050044a794d091cb4101705254baf987e0016
new file mode 100644 (file)
index 0000000..0f9c728
--- /dev/null
+++ b/6e/2050044a794d091cb4101705254baf987e0016
@@ -0,0 +1,136 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id B758E6DE0350\r
+ for <notmuch@notmuchmail.org>; Sat,  9 Jan 2016 18:51:55 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.31\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.31 tagged_above=-999 required=5 tests=[AWL=0.241, \r
+ RP_MATCHES_RCVD=-0.55, SPF_PASS=-0.001] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id ucYN7Dj1nb0i for <notmuch@notmuchmail.org>;\r
+ Sat,  9 Jan 2016 18:51:53 -0800 (PST)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 806716DE02C9\r
+ for <notmuch@notmuchmail.org>; Sat,  9 Jan 2016 18:51:53 -0800 (PST)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1aI66Z-0007DA-SG; Sat, 09 Jan 2016 21:51:43 -0500\r
+Received: (nullmailer pid 29644 invoked by uid 1000);\r
+ Sun, 10 Jan 2016 02:51:47 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [WIP patch 3/9] lib: add and test function to retrive current key\r
+Date: Sat,  9 Jan 2016 22:51:35 -0400\r
+Message-Id: <1452394301-29499-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.6.4\r
+In-Reply-To: <1452394301-29499-1-git-send-email-david@tethera.net>\r
+References: <1452394301-29499-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 10 Jan 2016 02:51:55 -0000\r
+\r
+---\r
+ lib/metadata.cc       | 17 +++++++++++++++++\r
+ lib/notmuch.h         |  6 ++++++\r
+ test/T590-metadata.sh |  4 +++-\r
+ 3 files changed, 26 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/lib/metadata.cc b/lib/metadata.cc\r
+index 5d319c5..20805e5 100644\r
+--- a/lib/metadata.cc\r
++++ b/lib/metadata.cc\r
+@@ -26,6 +26,7 @@ struct _notmuch_metadata {\r
+     notmuch_database_t *notmuch;\r
+     Xapian::TermIterator *iterator;\r
+     notmuch_metadata_class_t mclass;\r
++    char *current_key;\r
+ };\r
+ \r
+ static int\r
+@@ -180,6 +181,7 @@ notmuch_database_get_all_metadata (notmuch_database_t *notmuch,\r
+     list->iterator = new Xapian::TermIterator;\r
+     list->notmuch = notmuch;\r
+     list->mclass = mclass;\r
++    list->current_key = NULL;\r
+ \r
+     try {\r
+ \r
+@@ -211,3 +213,18 @@ notmuch_metadata_valid (notmuch_metadata_t *metadata)\r
+ \r
+     return (strncmp((**(metadata->iterator)).c_str (), prefix, strlen (prefix)) == 0);\r
+ }\r
++\r
++const char *\r
++notmuch_metadata_key (notmuch_metadata_t *metadata)\r
++{\r
++    const char *prefix = _find_metadata_prefix (metadata->mclass);\r
++\r
++    if (metadata->current_key)\r
++      talloc_free (metadata->current_key);\r
++    metadata->current_key = talloc_strdup (metadata, (**(metadata->iterator)).c_str () + strlen (prefix));\r
++\r
++    return  metadata->current_key;\r
++}\r
++\r
++const char *\r
++}\r
+diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+index a2b7040..16d0973 100644\r
+--- a/lib/notmuch.h\r
++++ b/lib/notmuch.h\r
+@@ -1866,6 +1866,12 @@ notmuch_database_get_all_metadata (notmuch_database_t *db, notmuch_metadata_clas\r
+  */\r
+ notmuch_bool_t\r
+ notmuch_metadata_valid (notmuch_metadata_t *metadata);\r
++\r
++/**\r
++ * return key for current metadata pair\r
++ */\r
++const char *\r
++notmuch_metadata_key (notmuch_metadata_t *metadata);\r
+ /* @} */\r
+ \r
+ NOTMUCH_END_DECLS\r
+diff --git a/test/T590-metadata.sh b/test/T590-metadata.sh\r
+index c36a7d7..2c44746 100755\r
+--- a/test/T590-metadata.sh\r
++++ b/test/T590-metadata.sh\r
+@@ -55,17 +55,19 @@ testkey2 = testvalue2\r
+ EOF\r
+ test_expect_equal_file EXPECTED OUTPUT\r
+ \r
+-test_begin_subtest "notmuch_database_get_all_metadata initially valid"\r
++test_begin_subtest "notmuch_database_get_all_metadata first item"\r
+ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}\r
+ {\r
+    notmuch_metadata_t *meta;\r
+    RUN(notmuch_database_get_all_metadata (db, NOTMUCH_METADATA_CONFIG, &meta));\r
+    printf("valid = %d\n", notmuch_metadata_valid (meta));\r
++   printf("key = %s\n", notmuch_metadata_key (meta));\r
+ }\r
+ EOF\r
+ cat <<'EOF' >EXPECTED\r
+ == stdout ==\r
+ valid = 1\r
++key = testkey1\r
+ == stderr ==\r
+ EOF\r
+ test_expect_equal_file EXPECTED OUTPUT\r
+-- \r
+2.6.4\r
+\r