09/bffd89487ba361ab0498bf3c30fe21a80621bb

   1 Return-Path: <amthrax@drake.mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id EDD71431FB6\r
   6         for <notmuch@notmuchmail.org>; Sat,  7 Apr 2012 17:58:01 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id 8DwOEfTt4bPB for <notmuch@notmuchmail.org>;\r
  16         Sat,  7 Apr 2012 17:58:00 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
  18         [18.7.68.36])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 56E1B431FBC\r
  20         for <notmuch@notmuchmail.org>; Sat,  7 Apr 2012 17:58:00 -0700 (PDT)\r
  21 X-AuditID: 12074424-b7fae6d000000906-a8-4f80e297ab8b\r
  22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  23         by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id BD.C3.02310.792E08F4; Sat,  7 Apr 2012 20:57:59 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q380vxGZ005094; \r
  27         Sat, 7 Apr 2012 20:57:59 -0400\r
  28 Received: from drake.mit.edu\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q380vwlP002164\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sat, 7 Apr 2012 20:57:58 -0400 (EDT)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amthrax@drake.mit.edu>)\r
  37         id 1SGgS5-0001SN-U3; Sat, 07 Apr 2012 20:57:57 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 1/6] Sync schemata with current code structure\r
  41 Date: Sat,  7 Apr 2012 20:57:45 -0400\r
  42 Message-Id: <1333846670-5356-2-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.9.1\r
  44 In-Reply-To: <1333846670-5356-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1333846670-5356-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrTv9UYO/wY7j1hbXb85kdmD0eLbq\r
  48         FnMAYxSXTUpqTmZZapG+XQJXxvyns9kKDglXrOmaxtzAOIuvi5GTQ0LAROLq/1esELaYxIV7\r
  49         69m6GLk4hAT2MUpsvf+QDSQhJLCeUeL+MmWIxD0miRdLbjFDOPMZJXYdmMEEUsUmoCGxbf9y\r
  50         RhBbREBaYufd2UBjOTiYBdQk/nSpgISFBewkNty4BlbCIqAqcWB3AzOIzStgL7Hz2VeoKxQk\r
  51         nq07DjaSU8BBYnvrVmaII+wlli4+zjiBkX8BI8MqRtmU3Crd3MTMnOLUZN3i5MS8vNQiXXO9\r
  52         3MwSvdSU0k2MoKBhd1HZwdh8SOkQowAHoxIPr+XuBn8h1sSy4srcQ4ySHExKorxPHwCF+JLy\r
  53         UyozEosz4otKc1KLDzFKcDArifDePwyU401JrKxKLcqHSUlzsCiJ82povfMTEkhPLEnNTk0t\r
  54         SC2CycpwcChJ8L5+CNQoWJSanlqRlplTgpBm4uAEGc4DNFzyEcjw4oLE3OLMdIj8KUZFKXHe\r
  55         FyDNAiCJjNI8uF5YVL9iFAd6RZj3O0gVDzAhwHW/AhrMBDS45lU9yOCSRISUVAOj0dXupE0c\r
  56         TUvYxdXzNnNbz8qYanXoef6vyu6fsneTnqyJd5Xhsgvp9l65WOmjXbyr1b2WAqFnHy4e6Fp9\r
  57         yPfGHWOZtsodS6JWtZ12dzEI+rasbsYim8bmeZ9Wn5zKUBqWP6nSNFD1x87VTlyOxw++kOO8\r
  58         xN8nMtPXhVt5+/Jzaqs4ZT07fHYqsRRnJBpqMRcVJwIA5YLQfcUCAAA=\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Sun, 08 Apr 2012 00:58:02 -0000\r
  72 \r
  73 The schema itself hasn't changed, but many of the references to\r
  74 functions in notmuch-show.c were out of date.\r
  75 ---\r
  76  devel/schemata |   21 +++++++--------------\r
  77  1 files changed, 7 insertions(+), 14 deletions(-)\r
  78 \r
  79 diff --git a/devel/schemata b/devel/schemata\r
  80 index 728a46f..977cea7 100644\r
  81 --- a/devel/schemata\r
  82 +++ b/devel/schemata\r
  83 @@ -36,7 +36,7 @@ thread_node = [\r
  84      [thread_node*]            # children of message\r
  85  ]\r
  86  \r
  87 -# A message (show_message)\r
  88 +# A message (format_part_json)\r
  89  message = {\r
  90      # (format_message_json)\r
  91      id:             messageid,\r
  92 @@ -50,18 +50,13 @@ message = {\r
  93      body:           [part]\r
  94  }\r
  95  \r
  96 -# A MIME part (show_message_body)\r
  97 +# A MIME part (format_part_json)\r
  98  part = {\r
  99 -    # format_part_start_json\r
 100      id:             int|string, # part id (currently DFS part number)\r
 101  \r
 102 -    # format_part_encstatus_json\r
 103      encstatus?:     encstatus,\r
 104 -\r
 105 -    # format_part_sigstatus_json\r
 106      sigstatus?:     sigstatus,\r
 107  \r
 108 -    # format_part_content_json\r
 109      content-type:   string,\r
 110      content-id?:    string,\r
 111      # if content-type starts with "multipart/":\r
 112 @@ -77,9 +72,7 @@ part = {\r
 113      content?:       string\r
 114  }\r
 115  \r
 116 -# The headers of a message (format_headers_json with raw headers\r
 117 -# and reply = FALSE) or a part (format_headers_message_part_json\r
 118 -# with pretty-printed headers)\r
 119 +# The headers of a message or part (format_headers_json with reply = FALSE)\r
 120  headers = {\r
 121      Subject:        string,\r
 122      From:           string,\r
 123 @@ -89,14 +82,14 @@ headers = {\r
 124      Date:           string\r
 125  }\r
 126  \r
 127 -# Encryption status (format_part_encstatus_json)\r
 128 +# Encryption status (format_part_json)\r
 129  encstatus = [{status: "good"|"bad"}]\r
 130  \r
 131  # Signature status (format_part_sigstatus_json)\r
 132  sigstatus = [signature*]\r
 133  \r
 134  signature = {\r
 135 -    # signature_status_to_string\r
 136 +    # (signature_status_to_string)\r
 137      status:         "none"|"good"|"bad"|"error"|"unknown",\r
 138      # if status is "good":\r
 139      fingerprint?:   string,\r
 140 @@ -142,14 +135,14 @@ notmuch reply schema\r
 141  --------------------\r
 142  \r
 143  reply = {\r
 144 -    # The headers of the constructed reply (format_headers_json with\r
 145 -    # raw headers and reply = TRUE)\r
 146 +    # The headers of the constructed reply\r
 147      reply-headers: reply_headers,\r
 148  \r
 149      # As in the show format (format_part_json)\r
 150      original: message\r
 151  }\r
 152  \r
 153 +# Reply headers (format_headers_json with reply = TRUE)\r
 154  reply_headers = {\r
 155      Subject:        string,\r
 156      From:           string,\r
 157 -- \r
 158 1.7.9.1\r
 159 \r