[WIP patch 4/9] lib: add and test function to retrieve current metadata value

diff --git a/c1/21c4747690c1260cb038eb63ddad40724ada93 b/c1/21c4747690c1260cb038eb63ddad40724ada93
new file mode 100644 (file)
index 0000000..49ca6ac
--- /dev/null
+++ b/c1/21c4747690c1260cb038eb63ddad40724ada93
@@ -0,0 +1,113 @@
+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 A2E366DE0A94\r
+ for <notmuch@notmuchmail.org>; Sat,  9 Jan 2016 18:52:09 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.313\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.313 tagged_above=-999 required=5 tests=[AWL=0.238,\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 cFOhjkT2s6H3 for <notmuch@notmuchmail.org>;\r
+ Sat,  9 Jan 2016 18:52:08 -0800 (PST)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id E40BA6DE119D\r
+ for <notmuch@notmuchmail.org>; Sat,  9 Jan 2016 18:51:57 -0800 (PST)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1aI66e-0007Dt-5A; Sat, 09 Jan 2016 21:51:48 -0500\r
+Received: (nullmailer pid 29646 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 4/9] lib: add and test function to retrieve current\r
+ metadata value\r
+Date: Sat,  9 Jan 2016 22:51:36 -0400\r
+Message-Id: <1452394301-29499-5-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:52:09 -0000\r
+\r
+---\r
+ lib/metadata.cc       | 11 +++++++++++\r
+ lib/notmuch.h         |  7 +++++++\r
+ test/T590-metadata.sh |  2 ++\r
+ 3 files changed, 20 insertions(+)\r
+\r
+diff --git a/lib/metadata.cc b/lib/metadata.cc\r
+index 20805e5..6236992 100644\r
+--- a/lib/metadata.cc\r
++++ b/lib/metadata.cc\r
+@@ -227,4 +227,15 @@ notmuch_metadata_key (notmuch_metadata_t *metadata)\r
+ }\r
+ \r
+ const char *\r
++notmuch_metadata_value (notmuch_metadata_t *metadata)\r
++{\r
++    const char *key = notmuch_metadata_key (metadata);\r
++    char *val;\r
++    notmuch_status_t status;\r
++\r
++    status=notmuch_database_get_metadata (metadata->notmuch, metadata->mclass, key, &val);\r
++    if (status)\r
++      return NULL;\r
++\r
++    return val;\r
+ }\r
+diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+index 16d0973..dd359c8 100644\r
+--- a/lib/notmuch.h\r
++++ b/lib/notmuch.h\r
+@@ -1872,6 +1872,13 @@ notmuch_metadata_valid (notmuch_metadata_t *metadata);\r
+  */\r
+ const char *\r
+ notmuch_metadata_key (notmuch_metadata_t *metadata);\r
++\r
++/**\r
++ * return value for current metadata pair\r
++ */\r
++const char *\r
++notmuch_metadata_value (notmuch_metadata_t *metadata);\r
++\r
+ /* @} */\r
+ \r
+ NOTMUCH_END_DECLS\r
+diff --git a/test/T590-metadata.sh b/test/T590-metadata.sh\r
+index 2c44746..d2326d4 100755\r
+--- a/test/T590-metadata.sh\r
++++ b/test/T590-metadata.sh\r
+@@ -62,12 +62,14 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}\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
++   printf("val = %s\n", notmuch_metadata_value (meta));\r
+ }\r
+ EOF\r
+ cat <<'EOF' >EXPECTED\r
+ == stdout ==\r
+ valid = 1\r
+ key = testkey1\r
++val = testvalue1\r
+ == stderr ==\r
+ EOF\r
+ test_expect_equal_file EXPECTED OUTPUT\r
+-- \r
+2.6.4\r
+\r