lib/PublicInbox/View.pm | 14 ++++---------- diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 60fc1df17f9e5e242d55a7f05a00ca2e7943c07e..c151f221cc9ea1667fafd20253157c1bc9d7c7a5 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -409,7 +409,7 @@ my ($ctx) = @_; my $mid = $ctx->{mid}; my $srch = $ctx->{srch}; my $sres = $srch->get_thread($mid); - my $msgs = load_results($srch, $sres); + my $msgs = $sres->{msgs}; my $nr = $sres->{total}; return missing_thread($ctx) if $nr == 0; my $skel = '
';
@@ -680,7 +680,7 @@ $ctx->{cur} = $mid;
$ctx->{prev_attr} = '';
$ctx->{prev_level} = 0;
$ctx->{dst} = $dst;
- $sres = load_results($srch, $sres);
+ $sres = $sres->{msgs};
# reduce hash lookups in skel_dump
my $ibx = $ctx->{-inbox};
@@ -801,12 +801,6 @@ my ($level) = @_;
$level ? INDENT x ($level - 1) : '';
}
-sub load_results {
- my ($srch, $sres) = @_;
- my $msgs = delete $sres->{msgs};
- $srch->retry_reopen(sub { [ map { $_->mid; $_ } @$msgs ] });
-}
-
sub thread_results {
my ($ctx, $msgs) = @_;
require PublicInbox::SearchThread;
@@ -1088,9 +1082,9 @@ }
}
my $sres = $srch->query($qs, $opts);
- my $nr = scalar @{$sres->{msgs}};
+ $sres = $sres->{msgs};
+ my $nr = scalar @$sres;
if ($nr) {
- $sres = load_results($srch, $sres);
walk_thread(thread_results($ctx, $sres), $ctx, *acc_topic);
}
$ctx->{-next_o} = $off + $nr;