X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=cad90a7934e1632c2a5a42b95b22c9698831b024;hb=87dca6d8d5988c5eb54019cca342450b0b7dd6b7;hp=f5b278c297ee59a5e9496a05736aa9cdccaa7997;hpb=11707dae97d1f4638157cfee298464b2f2deeed4;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index f5b278c2..cad90a79 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -9,8 +9,7 @@ use warnings; use PublicInbox::MsgTime qw(msg_datestamp); use PublicInbox::Hval qw/ascii_html obfuscate_addrs/; use PublicInbox::Linkify; -use PublicInbox::MID qw/mid_clean id_compress mid_mime mid_escape mids - references/; +use PublicInbox::MID qw/id_compress mid_escape mids references/; use PublicInbox::MsgIter; use PublicInbox::Address; use PublicInbox::WwwStream; @@ -409,9 +408,7 @@ sub thread_html { my ($ctx) = @_; my $mid = $ctx->{mid}; my $srch = $ctx->{srch}; - my $sres = $srch->get_thread($mid); - my $msgs = load_results($srch, $sres); - 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'; @@ -650,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 ) . @@ -681,12 +677,11 @@ sub thread_skel { $ctx->{prev_attr} = ''; $ctx->{prev_level} = 0; $ctx->{dst} = $dst; - $sres = load_results($srch, $sres); # 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; } @@ -802,12 +797,6 @@ sub indent_for { $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; @@ -1070,17 +1059,15 @@ sub index_nav { # callback for WwwStream sub index_topics { my ($ctx) = @_; my ($off) = (($ctx->{qp}->{o} || '0') =~ /(\d+)/); - my $opts = { offset => $off, limit => 200 }; $ctx->{order} = []; my $srch = $ctx->{srch}; - my $sres = $srch->query('', $opts); - my $nr = scalar @{$sres->{msgs}}; + my $msgs = $ctx->{-inbox}->recent({offset => $off, limit => 200 }); + my $nr = scalar @$msgs; if ($nr) { - $sres = load_results($srch, $sres); - walk_thread(thread_results($ctx, $sres), $ctx, *acc_topic); + walk_thread(thread_results($ctx, $msgs), $ctx, *acc_topic); } - $ctx->{-next_o} = $off+ $nr; + $ctx->{-next_o} = $off + $nr; $ctx->{-cur_o} = $off; PublicInbox::WwwStream->response($ctx, dump_topics($ctx), *index_nav); }