From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH 4/9] lib: read reference terms into message struct.
Date: Sat, 21 Jul 2018 08:37:41 +0900 [thread overview]
Message-ID: <20180720233746.2844-5-david@tethera.net> (raw)
In-Reply-To: <20180720233746.2844-1-david@tethera.net>
The plan is to use these in resolving threads.
---
lib/message.cc | 17 +++++++++++++++++
lib/notmuch-private.h | 3 +++
2 files changed, 20 insertions(+)
diff --git a/lib/message.cc b/lib/message.cc
index 153e4bed..790d26f5 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -41,6 +41,7 @@ struct _notmuch_message {
notmuch_message_file_t *message_file;
notmuch_string_list_t *property_term_list;
notmuch_string_map_t *property_map;
+ notmuch_string_list_t *reference_list;
notmuch_message_list_t *replies;
unsigned long flags;
/* For flags that are initialized on-demand, lazy_flags indicates
@@ -129,6 +130,7 @@ _notmuch_message_create_for_document (const void *talloc_owner,
message->author = NULL;
message->property_term_list = NULL;
message->property_map = NULL;
+ message->reference_list = NULL;
message->replies = _notmuch_message_list_create (message);
if (unlikely (message->replies == NULL)) {
@@ -349,6 +351,7 @@ _notmuch_message_ensure_metadata (notmuch_message_t *message, void *field)
*type_prefix = _find_prefix ("type"),
*filename_prefix = _find_prefix ("file-direntry"),
*property_prefix = _find_prefix ("property"),
+ *reference_prefix = _find_prefix ("reference"),
*replyto_prefix = _find_prefix ("replyto");
/* We do this all in a single pass because Xapian decompresses the
@@ -413,6 +416,14 @@ _notmuch_message_ensure_metadata (notmuch_message_t *message, void *field)
_notmuch_database_get_terms_with_prefix (message, i, end,
property_prefix);
+ /* get references */
+ assert (strcmp (property_prefix, reference_prefix) < 0);
+ if (!message->reference_list) {
+ message->reference_list =
+ _notmuch_database_get_terms_with_prefix (message, i, end,
+ reference_prefix);
+ }
+
/* Get reply to */
assert (strcmp (property_prefix, replyto_prefix) < 0);
if (!message->in_reply_to)
@@ -588,6 +599,12 @@ _notmuch_message_add_reply (notmuch_message_t *message,
_notmuch_message_list_add_message (message->replies, reply);
}
+const notmuch_string_list_t *
+_notmuch_message_get_references (notmuch_message_t *message)
+{
+ return message->reference_list;
+}
+
notmuch_messages_t *
notmuch_message_get_replies (notmuch_message_t *message)
{
diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
index 499d73d4..e7bbc156 100644
--- a/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@ -580,6 +580,9 @@ _notmuch_string_list_append (notmuch_string_list_t *list,
void
_notmuch_string_list_sort (notmuch_string_list_t *list);
+const notmuch_string_list_t *
+_notmuch_message_get_references(notmuch_message_t *message);
+
/* string-map.c */
typedef struct _notmuch_string_map notmuch_string_map_t;
typedef struct _notmuch_string_map_iterator notmuch_string_map_iterator_t;
--
2.18.0
next prev parent reply other threads:[~2018-07-20 23:38 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-20 23:37 v1: fix for threading of replies to ghost messages David Bremner
2018-07-20 23:37 ` [PATCH 1/9] util: add DEBUG_PRINTF, rename error_util.h -> debug_print.h David Bremner
2018-07-20 23:37 ` [PATCH 2/9] test: start threading test corpus David Bremner
2018-07-20 23:37 ` [PATCH 3/9] test: add known broken tests for "ghost roots" David Bremner
2018-07-20 23:37 ` David Bremner [this message]
2018-07-20 23:37 ` [PATCH 5/9] lib/thread: refactor in-reply-to test David Bremner
2018-07-20 23:37 ` [PATCH 6/9] lib: initial fix for "ghost replyto" David Bremner
2018-07-20 23:37 ` [PATCH 7/9] lib: calculate message depth in thread David Bremner
2018-07-20 23:37 ` [PATCH 8/9] lib/thread: rewrite _parent_or_toplevel to use depths David Bremner
2018-07-20 23:37 ` [PATCH 9/9] lib/thread: change _resolve_thread_relationships " David Bremner
2018-07-21 17:35 ` v1: fix for threading of replies to ghost messages Gregor Zattler
2018-07-23 8:41 ` David Bremner
2018-07-23 12:09 ` Gregor Zattler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180720233746.2844-5-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).