From 11707dae97d1f4638157cfee298464b2f2deeed4 Mon Sep 17 00:00:00 2001 From: "Eric Wong (Contractor, The Linux Foundation)" Date: Thu, 29 Mar 2018 09:57:52 +0000 Subject: search: get rid of most lookup_* subroutines Too many similar functions doing the same basic thing was redundant and misleading, especially since Message-ID is no longer treated as a truly unique identifier. For displaying threads in the HTML, this makes it clear that we favor the primary Message-ID mapped to an NNTP article number if a message cannot be found. --- t/search-thr-index.t | 3 ++- t/search.t | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 't') diff --git a/t/search-thr-index.t b/t/search-thr-index.t index 6c6e4c57..9549976d 100644 --- a/t/search-thr-index.t +++ b/t/search-thr-index.t @@ -4,6 +4,7 @@ use strict; use warnings; use Test::More; use File::Temp qw/tempdir/; +use PublicInbox::MID qw(mids); use Email::MIME; eval { require PublicInbox::SearchIdx; }; plan skip_all => "Xapian missing for search" if $@; @@ -41,7 +42,7 @@ foreach (reverse split(/\n\n/, $data)) { $mime->header_set('From' => 'bw@g'); $mime->header_set('To' => 'git@vger.kernel.org'); my $bytes = bytes::length($mime->as_string); - my $mid = $mime->header('Message-Id'); + my $mid = mids($mime->header_obj)->[0]; my $doc_id = $rw->add_message($mime, $bytes, ++$num, 'ignored', $mid); push @mids, $mid; ok($doc_id, 'message added: '. $mid); diff --git a/t/search.t b/t/search.t index 6b1aa2a3..ccf0f746 100644 --- a/t/search.t +++ b/t/search.t @@ -89,7 +89,7 @@ sub filter_mids { { $rw_commit->(); $ro->reopen; - my $found = $ro->lookup_message(''); + my $found = $ro->first_smsg_by_mid('root@s'); ok($found, "message found"); is($root_id, $found->{doc_id}, 'doc_id set correctly'); is($found->mid, 'root@s', 'mid set correctly'); @@ -264,7 +264,7 @@ sub filter_mids { ], body => "LOOP!\n")); ok($doc_id > 0, "doc_id defined with circular reference"); - my $smsg = $rw->lookup_message('circle@a'); + my $smsg = $rw->first_smsg_by_mid('circle@a'); is($smsg->references, '', "no references created"); my $msg = PublicInbox::SearchMsg->load_doc($smsg->{doc}); is($s, $msg->subject, 'long subject not rewritten'); @@ -281,7 +281,7 @@ sub filter_mids { my $mime = Email::MIME->new($str); my $doc_id = $rw->add_message($mime); ok($doc_id > 0, 'message indexed doc_id with UTF-8'); - my $smsg = $rw->lookup_message('testmessage@example.com'); + my $smsg = $rw->first_smsg_by_mid('testmessage@example.com'); my $msg = PublicInbox::SearchMsg->load_doc($smsg->{doc}); is($mime->header('Subject'), $msg->subject, 'UTF-8 subject preserved'); -- cgit v1.2.3-24-ge0c7