mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-25 04:18:08 +01:00
lib: Save and restore term position in message while indexing.
This fixes the recently addead search-position-overlap bug as demonstrated in the test of the same name.
This commit is contained in:
parent
fb54dee4ac
commit
db70f3f0c4
1 changed files with 4 additions and 0 deletions
|
@ -39,6 +39,7 @@ struct _notmuch_message {
|
|||
unsigned long flags;
|
||||
|
||||
Xapian::Document doc;
|
||||
Xapian::termcount termpos;
|
||||
};
|
||||
|
||||
#define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
|
||||
|
@ -123,6 +124,7 @@ _notmuch_message_create_for_document (const void *talloc_owner,
|
|||
talloc_set_destructor (message, _notmuch_message_destructor);
|
||||
|
||||
message->doc = doc;
|
||||
message->termpos = 0;
|
||||
|
||||
return message;
|
||||
}
|
||||
|
@ -824,11 +826,13 @@ _notmuch_message_gen_terms (notmuch_message_t *message,
|
|||
return NOTMUCH_PRIVATE_STATUS_NULL_POINTER;
|
||||
|
||||
term_gen->set_document (message->doc);
|
||||
term_gen->set_termpos (message->termpos);
|
||||
|
||||
if (prefix_name) {
|
||||
const char *prefix = _find_prefix (prefix_name);
|
||||
|
||||
term_gen->index_text (text, 1, prefix);
|
||||
message->termpos = term_gen->get_termpos ();
|
||||
}
|
||||
|
||||
term_gen->index_text (text);
|
||||
|
|
Loading…
Reference in a new issue