aboutsummaryrefslogtreecommitdiff
path: root/lib/message.cc
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2019-02-25 21:57:40 -0400
committerDavid Bremner <david@tethera.net>2019-05-25 07:17:27 -0300
commit75bdce79527571c12c5de0c630747d6262b73fbd (patch)
tree3b6b293ab053d247e74224337cd3eeb080facf07 /lib/message.cc
parentb52cda90f0b05ce5055fb840e6d9dd88c09f1f83 (diff)
lib: support user prefix names in term generation
This should not change the indexing process yet as nothing calls _notmuch_message_gen_terms with a user prefix name. On the other hand, it should not break anything either. _notmuch_database_prefix does a linear walk of the list of (built-in) prefixes, followed by a logarithmic time search of the list of user prefixes. The latter is probably not really noticable.
Diffstat (limited to 'lib/message.cc')
-rw-r--r--lib/message.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/message.cc b/lib/message.cc
index 4d1b08d6..dc4a96ad 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -1446,8 +1446,12 @@ _notmuch_message_gen_terms (notmuch_message_t *message,
term_gen->set_termpos (message->termpos);
if (prefix_name) {
+ const char *prefix = _notmuch_database_prefix (message->notmuch, prefix_name);
+ if (prefix == NULL)
+ return NOTMUCH_PRIVATE_STATUS_BAD_PREFIX;
+
_notmuch_message_invalidate_metadata (message, prefix_name);
- term_gen->index_text (text, 1, _find_prefix (prefix_name));
+ term_gen->index_text (text, 1, prefix);
} else {
term_gen->index_text (text);
}