From 5301a9d1b07ad5af1b62df870b7181461603f460 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 20 Aug 2020 20:24:57 +0000 Subject: search: add mset_to_artnums method We can avoid importing mdocid() in several places by using this method, simplifying callers. --- lib/PublicInbox/Mbox.pm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'lib/PublicInbox/Mbox.pm') diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm index 0fa9a38d..873ff7be 100644 --- a/lib/PublicInbox/Mbox.pm +++ b/lib/PublicInbox/Mbox.pm @@ -10,7 +10,6 @@ use PublicInbox::MID qw/mid_escape/; use PublicInbox::Hval qw/to_filename/; use PublicInbox::Smsg; use PublicInbox::Eml; -use PublicInbox::Search qw(mdocid); # called by PSGI server as body response # this gets called twice for every message, once to return the header, @@ -217,8 +216,7 @@ sub results_cb { my $mset = $srch->query($ctx->{query}, $ctx->{qopts}); my $size = $mset->size or return; $ctx->{qopts}->{offset} += $size; - my $nshard = $srch->{nshard} // 1; - $ctx->{ids} = [ map { mdocid($nshard, $_) } $mset->items ]; + $ctx->{ids} = $srch->mset_to_artnums($mset); } } @@ -234,8 +232,7 @@ sub mbox_all { return [404, [qw(Content-Type text/plain)], ["No results found\n"]]; $ctx->{query} = $query; - my $nshard = $srch->{nshard} // 1; - $ctx->{ids} = [ map { mdocid($nshard, $_) } $mset->items ]; + $ctx->{ids} = $srch->mset_to_artnums($mset); require PublicInbox::MboxGz; PublicInbox::MboxGz::mbox_gz($ctx, \&results_cb, 'results-'.$query); } -- cgit v1.2.3-24-ge0c7