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. --- lib/database.cc | 20 ++++++++++++++++++++ lib/message.cc | 5 ++++- lib/notmuch-private.h | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/lib/database.cc b/lib/database.cc index 6caa1311..19aff0e8 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -405,6 +405,26 @@ _find_prefix (const char *name) return ""; } +/* Like find prefix, but include the possibility of user defined + * prefixes specific to this database */ + +const char * +_notmuch_database_prefix (notmuch_database_t *notmuch, const char *name) +{ + unsigned int i; + + /*XXX TODO: reduce code duplication */ + for (i = 0; i < ARRAY_SIZE (prefix_table); i++) { + if (strcmp (name, prefix_table[i].name) == 0) + return prefix_table[i].prefix; + } + + if (notmuch->user_prefix) + return _notmuch_string_map_get (notmuch->user_prefix, name); + + return NULL; +} + static const struct { /* NOTMUCH_FEATURE_* value. */ _notmuch_features value; diff --git a/lib/message.cc b/lib/message.cc index 6f2f6345..bbc5ef99 100644 --- a/lib/message.cc +++ b/lib/message.cc @@ -1434,7 +1434,10 @@ _notmuch_message_gen_terms (notmuch_message_t *message, term_gen->set_document (message->doc); if (prefix_name) { - const char *prefix = _find_prefix (prefix_name); + const char *prefix = _notmuch_database_prefix (message->notmuch, prefix_name); + + if (prefix == NULL) + return NOTMUCH_PRIVATE_STATUS_BAD_PREFIX; term_gen->set_termpos (message->termpos); term_gen->index_text (text, 1, prefix); diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index 1ef26e37..cf08411e 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -136,6 +136,7 @@ typedef enum _notmuch_private_status { /* Then add our own private values. */ NOTMUCH_PRIVATE_STATUS_TERM_TOO_LONG = NOTMUCH_STATUS_LAST_STATUS, NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND, + NOTMUCH_PRIVATE_STATUS_BAD_PREFIX, NOTMUCH_PRIVATE_STATUS_LAST_STATUS } notmuch_private_status_t; -- 2.20.1 _______________________________________________ notmuch mailing list notmuch@notmuchmail.org https://notmuchmail.org/mailman/listinfo/notmuch