f9/f199a47f38b3847ea7e1775d616e35ac17e73c

   1 Return-Path: <markwalters1009@gmail.com>\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 215A9431FC3\r
   6         for <notmuch@notmuchmail.org>; Tue, 20 Mar 2012 13:12:16 -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.201\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
  14         RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  15 Received: from olra.theworths.org ([127.0.0.1])\r
  16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17         with ESMTP id bG0v1JxlnyuF for <notmuch@notmuchmail.org>;\r
  18         Tue, 20 Mar 2012 13:12:14 -0700 (PDT)\r
  19 Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com\r
  20         [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  21         (No client certificate requested)\r
  22         by olra.theworths.org (Postfix) with ESMTPS id 251F0431FAF\r
  23         for <notmuch@notmuchmail.org>; Tue, 20 Mar 2012 13:12:09 -0700 (PDT)\r
  24 Received: by wibhn6 with SMTP id hn6so483852wib.2\r
  25         for <notmuch@notmuchmail.org>; Tue, 20 Mar 2012 13:12:06 -0700 (PDT)\r
  26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
  27         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
  28         bh=rR1OelO4n28O8ZniT3jdS1YEJTRztUVQm3KpcBm2Tok=;\r
  29         b=x00ylADwCdt+1fDbqVvXl6HgkAoivqAzol/zIkH/8/UkU/BEMG2CBfvn8xvcsERIHN\r
  30         m2G6cg4KCuRFBF2u14B5rwaqLUN0UDsVPanJvv0Iacdl6D+j+zOCkN4S2QbvozM9mAkb\r
  31         95BoN1NlN+jj2BXP72e7PYUGcji+bFai/x54uZG+azk9PS2cwNDZJKRw/SrXHYuI2zw3\r
  32         QV/nvukBjdQsFcEjIucdFZON30S7HkLE5ydQQZuHcbeKOIq6NEcCpbTd7A3CmQIznklK\r
  33         9Mcci65Oyuaq294Ku5HRqwoUGobNU+Y88gN4d24wWSJt1jNYluQv2Cq/CIPvjIzOIToz\r
  34         Juxw==\r
  35 Received: by 10.180.19.196 with SMTP id h4mr2769699wie.12.1332274326437;\r
  36         Tue, 20 Mar 2012 13:12:06 -0700 (PDT)\r
  37 Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
  38  [94.192.233.223])      by mx.google.com with ESMTPS id\r
  39  ff9sm36556794wib.2.2012.03.20.13.12.04 (version=TLSv1/SSLv3 cipher=OTHER);\r
  40         Tue, 20 Mar 2012 13:12:05 -0700 (PDT)\r
  41 From: Mark Walters <markwalters1009@gmail.com>\r
  42 To: notmuch@notmuchmail.org\r
  43 Subject: [WIP 1/2] lib: multithread\r
  44 Date: Tue, 20 Mar 2012 20:11:59 +0000\r
  45 Message-Id: <1332274320-17487-2-git-send-email-markwalters1009@gmail.com>\r
  46 X-Mailer: git-send-email 1.7.9.1\r
  47 In-Reply-To: <1332274320-17487-1-git-send-email-markwalters1009@gmail.com>\r
  48 References: <1332274320-17487-1-git-send-email-markwalters1009@gmail.com>\r
  49 X-BeenThere: notmuch@notmuchmail.org\r
  50 X-Mailman-Version: 2.1.13\r
  51 Precedence: list\r
  52 List-Id: "Use and development of the notmuch mail system."\r
  53         <notmuch.notmuchmail.org>\r
  54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  55         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  57 List-Post: <mailto:notmuch@notmuchmail.org>\r
  58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  60         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  61 X-List-Received-Date: Tue, 20 Mar 2012 20:12:16 -0000\r
  62 \r
  63 ---\r
  64  lib/notmuch.h |   12 ++++++++++++\r
  65  lib/query.cc  |   46 +++++++++++++++++++++++++++++++++++++++++++++-\r
  66  2 files changed, 57 insertions(+), 1 deletions(-)\r
  67 \r
  68 diff --git a/lib/notmuch.h b/lib/notmuch.h\r
  69 index babd208..22dd69e 100644\r
  70 --- a/lib/notmuch.h\r
  71 +++ b/lib/notmuch.h\r
  72 @@ -445,6 +445,18 @@ typedef enum {\r
  73      NOTMUCH_SORT_UNSORTED\r
  74  } notmuch_sort_t;\r
  75  \r
  76 +/* Values for notmuch_query_secondary_search_conjunction */\r
  77 +typedef enum {\r
  78 +    NOTMUCH_SECONDARY_SEARCH_NONE,\r
  79 +    NOTMUCH_SECONDARY_SEARCH_AND,\r
  80 +    NOTMUCH_SECONDARY_SEARCH_AND_NOT\r
  81 +} notmuch_ss_conjunction_t;\r
  82 +\r
  83 +void\r
  84 +notmuch_query_set_secondary_search (notmuch_query_t *query,\r
  85 +                                   const char *secondary_search_terms,\r
  86 +                                   notmuch_ss_conjunction_t conjunction);\r
  87 +\r
  88  /* Return the query_string of this query. See notmuch_query_create. */\r
  89  const char *\r
  90  notmuch_query_get_query_string (notmuch_query_t *query);\r
  91 diff --git a/lib/query.cc b/lib/query.cc\r
  92 index 68ac1e4..0faef51 100644\r
  93 --- a/lib/query.cc\r
  94 +++ b/lib/query.cc\r
  95 @@ -26,6 +26,8 @@\r
  96  struct _notmuch_query {\r
  97      notmuch_database_t *notmuch;\r
  98      const char *query_string;\r
  99 +    const char *secondary_search_terms;\r
 100 +    notmuch_ss_conjunction_t ss_conjunction;\r
 101      notmuch_sort_t sort;\r
 102      notmuch_string_list_t *exclude_terms;\r
 103      notmuch_bool_t omit_excluded_messages;\r
 104 @@ -92,6 +94,8 @@ notmuch_query_create (notmuch_database_t *notmuch,\r
 105  \r
 106      query->exclude_terms = _notmuch_string_list_create (query);\r
 107  \r
 108 +    query->secondary_search_terms = NULL;\r
 109 +\r
 110      query->omit_excluded_messages = FALSE;\r
 111  \r
 112      return query;\r
 113 @@ -122,6 +126,15 @@ notmuch_query_get_sort (notmuch_query_t *query)\r
 114  }\r
 115  \r
 116  void\r
 117 +notmuch_query_set_secondary_search (notmuch_query_t *query,\r
 118 +                                   const char *secondary_search_terms,\r
 119 +                                   notmuch_ss_conjunction_t conjunction)\r
 120 +{\r
 121 +    query->secondary_search_terms = talloc_strdup (query, secondary_search_terms);\r
 122 +    query->ss_conjunction = conjunction;\r
 123 +}\r
 124 +\r
 125 +void\r
 126  notmuch_query_add_tag_exclude (notmuch_query_t *query, const char *tag)\r
 127  {\r
 128      char *term = talloc_asprintf (query, "%s%s", _find_prefix ("tag"), tag);\r
 129 @@ -454,6 +467,36 @@ notmuch_query_destroy (notmuch_query_t *query)\r
 130      talloc_free (query);\r
 131  }\r
 132  \r
 133 +/* This function tests whether the thread containing document with id\r
 134 + * seed_doc_id satisfies the secondary search terms of query.*/\r
 135 +notmuch_bool_t\r
 136 +notmuch_thread_test_secondary_search (notmuch_query_t *query, unsigned int seed_doc_id)\r
 137 +{\r
 138 +    int count;\r
 139 +    notmuch_message_t *seed_message;\r
 140 +    const char *thread_id;\r
 141 +    char *thread_id_query_string;\r
 142 +    notmuch_query_t *thread_id_query;\r
 143 +\r
 144 +    if (!query->secondary_search_terms) return TRUE;\r
 145 +    seed_message = _notmuch_message_create (query, query->notmuch, seed_doc_id, NULL);\r
 146 +\r
 147 +    thread_id = notmuch_message_get_thread_id (seed_message);\r
 148 +    thread_id_query_string = talloc_asprintf (query, "thread:%s and %s",\r
 149 +                                             thread_id,\r
 150 +                                             query->secondary_search_terms);\r
 151 +    thread_id_query = notmuch_query_create (query->notmuch, thread_id_query_string);\r
 152 +    count = notmuch_query_count_messages (thread_id_query);\r
 153 +    switch (query->ss_conjunction) {\r
 154 +    case NOTMUCH_SECONDARY_SEARCH_AND:\r
 155 +       return (count > 0);\r
 156 +    case NOTMUCH_SECONDARY_SEARCH_AND_NOT:\r
 157 +       return (count == 0);\r
 158 +    default:\r
 159 +       return TRUE;\r
 160 +    }\r
 161 +}\r
 162 +\r
 163  notmuch_bool_t\r
 164  notmuch_threads_valid (notmuch_threads_t *threads)\r
 165  {\r
 166 @@ -462,7 +505,8 @@ notmuch_threads_valid (notmuch_threads_t *threads)\r
 167      while (threads->doc_id_pos < threads->doc_ids->len) {\r
 168         doc_id = g_array_index (threads->doc_ids, unsigned int,\r
 169                                 threads->doc_id_pos);\r
 170 -       if (_notmuch_doc_id_set_contains (&threads->match_set, doc_id))\r
 171 +       if (_notmuch_doc_id_set_contains (&threads->match_set, doc_id) &&\r
 172 +           notmuch_thread_test_secondary_search (threads->query, doc_id))\r
 173             break;\r
 174  \r
 175         threads->doc_id_pos++;\r
 176 -- \r
 177 1.7.9.1\r
 178 \r