From 44327ca86d8e3563490801f57a2d1ca455d9588e Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sun, 15 Jun 2014 22:40:32 -0400 Subject: lib: Index name and address of from/to headers as a phrase Previously, we indexed the name and address parts of from/to headers with two calls to _notmuch_message_gen_terms. In general, this indicates that these parts are separate phrases. However, because of an implementation quirk, the two calls to _notmuch_message_gen_terms generated adjacent term positions for the prefixed terms, which happens to be the right thing to do in this case, but the wrong thing to do for all other calls. Furthermore, _notmuch_message_gen_terms produced potentially overlapping term positions for the un-prefixed copies of the terms, which is simply wrong. This change indexes both the name and address in a single call to _notmuch_message_gen_terms, indicating that they should be part of a single phrase. This masks the problem with the un-prefixed terms (fixing the two known-broken tests) and puts us in a position to fix the unintentionally phrases generated by other calls to _notmuch_message_gen_terms. --- test/T080-search.sh | 2 -- 1 file changed, 2 deletions(-) (limited to 'test') diff --git a/test/T080-search.sh b/test/T080-search.sh index 8ed57013..b63bf023 100755 --- a/test/T080-search.sh +++ b/test/T080-search.sh @@ -67,7 +67,6 @@ output=$(notmuch search 'from:"Search By From Name "' | notmuc test_expect_equal "$output" "thread:XXX 2000-01-01 [1/1] Search By From Name; search by from (name) (inbox unread)" test_begin_subtest "Search by from: without prefix (name and address)" -test_subtest_known_broken output=$(notmuch search '"Search By From Name "' | notmuch_search_sanitize) test_expect_equal "$output" "thread:XXX 2000-01-01 [1/1] Search By From Name; search by from (name) (inbox unread)" @@ -86,7 +85,6 @@ output=$(notmuch search 'to:"Search By To Name "' | notmuch_se test_expect_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (name) (inbox unread)" test_begin_subtest "Search by to: without prefix (name and adress)" -test_subtest_known_broken output=$(notmuch search '"Search By To Name "' | notmuch_search_sanitize) test_expect_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (name) (inbox unread)" -- cgit v1.2.3