X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=cad90a7934e1632c2a5a42b95b22c9698831b024;hp=8ac405f2b73cd78ce91b8e308738898694ac732b;hb=87dca6d8d5988c5eb54019cca342450b0b7dd6b7;hpb=3cc5ff405d9054fbf47ac44774fca4f9a72ff65a diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 8ac405f2..cad90a79 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -408,9 +408,7 @@ sub thread_html { my ($ctx) = @_; my $mid = $ctx->{mid}; my $srch = $ctx->{srch}; - my $sres = $srch->get_thread($mid); - my $msgs = $sres->{msgs}; - my $nr = $sres->{total}; + my ($nr, $msgs) = $srch->get_thread($mid); return missing_thread($ctx) if $nr == 0; my $skel = '
'; $skel .= $nr == 1 ? 'only message in thread' : 'end of thread'; @@ -649,8 +647,7 @@ sub thread_skel { my ($dst, $ctx, $hdr, $tpfx) = @_; my $srch = $ctx->{srch}; my $mid = mids($hdr)->[0]; - my $sres = $srch->get_thread($mid); - my $nr = $sres->{total}; + my ($nr, $msgs) = $srch->get_thread($mid); my $expand = qq(expand[flat) . qq(|nested] ) . qq(mbox.gz ) . @@ -680,12 +677,11 @@ sub thread_skel { $ctx->{prev_attr} = ''; $ctx->{prev_level} = 0; $ctx->{dst} = $dst; - $sres = $sres->{msgs}; # reduce hash lookups in skel_dump my $ibx = $ctx->{-inbox}; $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef; - walk_thread(thread_results($ctx, $sres), $ctx, *skel_dump); + walk_thread(thread_results($ctx, $msgs), $ctx, *skel_dump); $ctx->{parent_msg} = $parent; } @@ -1066,11 +1062,10 @@ sub index_topics { $ctx->{order} = []; my $srch = $ctx->{srch}; - my $sres = $ctx->{-inbox}->recent({offset => $off, limit => 200 }); - $sres = $sres->{msgs}; - my $nr = scalar @$sres; + my $msgs = $ctx->{-inbox}->recent({offset => $off, limit => 200 }); + my $nr = scalar @$msgs; if ($nr) { - walk_thread(thread_results($ctx, $sres), $ctx, *acc_topic); + walk_thread(thread_results($ctx, $msgs), $ctx, *acc_topic); } $ctx->{-next_o} = $off + $nr; $ctx->{-cur_o} = $off;