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 C355A431FD9 for ; Mon, 7 Oct 2013 15:33:37 -0700 (PDT) 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 pQo5jkoNx0sv for ; Mon, 7 Oct 2013 15:33:33 -0700 (PDT) Received: from dmz-mailsec-scanner-4.mit.edu (dmz-mailsec-scanner-4.mit.edu [18.9.25.15]) by olra.theworths.org (Postfix) with ESMTP id DB1F9431FB6 for ; Mon, 7 Oct 2013 15:33:29 -0700 (PDT) X-AuditID: 1209190f-b7fa08e0000009c6-84-525336b7331f Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP id 1C.4B.02502.7B633525; Mon, 7 Oct 2013 18:33:27 -0400 (EDT) Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id r97MXPLE024732; Mon, 7 Oct 2013 18:33:26 -0400 Received: from drake.dyndns.org (26-4-172.dynamic.csail.mit.edu [18.26.4.172]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r97MXNWt028498 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Mon, 7 Oct 2013 18:33:25 -0400 Received: from amthrax by drake.dyndns.org with local (Exim 4.77) (envelope-from ) id 1VTJMh-0006bh-Iw; Mon, 07 Oct 2013 18:33:23 -0400 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH 01/11] schemata: Disambiguate non-terminal names Date: Mon, 7 Oct 2013 18:33:11 -0400 Message-Id: <1381185201-25197-2-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1381185201-25197-1-git-send-email-amdragon@mit.edu> References: <1381185201-25197-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixG6nrrvdLDjIYNZdTYvrN2cyOzB6PFt1 izmAMYrLJiU1J7MstUjfLoEr4+6ylIIfHBV7b3WzNTBOYe9i5OSQEDCRuH37CyuELSZx4d56 ti5GLg4hgX2MEivnLGaHcDYwSsxvvsgI4Rxmktg37xMrhDOXUeL8i8fMIP1sAhoS2/YvZwSx RQSkJXbenQ1UxMHBLKAm8adLBSQsLOAgsWH5LiYQm0VAVWLG3q8sIDYvUPzVl5tsEGcoSSw8 tQ3sJE4BR4klGy+CxYWAaubuX8Q6gZF/ASPDKkbZlNwq3dzEzJzi1GTd4uTEvLzUIl0TvdzM Er3UlNJNjKCg4ZTk38H47aDSIUYBDkYlHt6Mo0FBQqyJZcWVuYcYJTmYlER5z5gGBwnxJeWn VGYkFmfEF5XmpBYfYpTgYFYS4RUwAsrxpiRWVqUW5cOkpDlYlMR5b3LYBwkJpCeWpGanphak FsFkZTg4lCR4w0CGChalpqdWpGXmlCCkmTg4QYbzAA1PBqnhLS5IzC3OTIfIn2JUlBLnnQ2S EABJZJTmwfXCovoVozjQK8K8W0GqeIAJAa77FdBgJqDBuuyBIINLEhFSUg2MjDPrVgq+/8mm 7Tf3F6+I6yELhlvnMoVqd/rfW53BXzT9gsvhY98PNSktbg6fu+j7thqPm7yCyofvm0wJ/pxU 3PrP4Xv7E8MlMmbrPFfEv/rZkrBEMuTk1PPqX8MmNh3o88gRc7p0eKe5vWiEqvFOk2MJ7XO/ /96UcuxJbNEKsxOR50vuWd2/qcRSnJFoqMVcVJwIANEG9QLFAgAA 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: Mon, 07 Oct 2013 22:33:38 -0000 Previously, the show schema and the search schema used different "thread" non-terminals. While these schemata don't interact, this is still confusing, so rename search's "thread" to "thread_summary". To further limit confusion, prefix all top-level search non-terminals now begin with "search_". --- devel/schemata | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/devel/schemata b/devel/schemata index 2405756..cdd0e43 100644 --- a/devel/schemata +++ b/devel/schemata @@ -122,21 +122,21 @@ notmuch search schema --------------------- # --output=summary -summary = [thread*] +search_summary = [thread_summary*] # --output=threads -threads = [threadid*] +search_threads = [threadid*] # --output=messages -messages = [messageid*] +search_messages = [messageid*] # --output=files -files = [string*] +search_files = [string*] # --output=tags -tags = [string*] +search_tags = [string*] -thread = { +thread_summary = { thread: threadid, timestamp: unix_time, date_relative: string, # user-friendly timestamp -- 1.8.4.rc3