www: reduce long-lived PublicInbox::Search references

[public-inbox.git] / lib / PublicInbox / SearchView.pm

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index eeebdfa3137903f64426b0fc96773a58b946a3bd..5d77469ed522bcbf14f09904275860bd876f651b 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -287,21 +287,17 @@ sub mset_thread {
 
        @$msgs = reverse @$msgs if $r;
        $ctx->{msgs} = $msgs;
-       PublicInbox::WwwStream::response($ctx, 200, \&mset_thread_i);
+       PublicInbox::WwwStream::aresponse($ctx, 200, \&mset_thread_i);
 }
 
 # callback for PublicInbox::WwwStream::getline
 sub mset_thread_i {
-       my ($ctx) = @_;
-       return $ctx->html_top if exists $ctx->{-html_tip};
-       my $msgs = $ctx->{msgs} or return;
-       while (my $smsg = pop @$msgs) {
-               my $eml = $ctx->{-inbox}->smsg_eml($smsg) or next;
-               return PublicInbox::View::eml_entry($ctx, $smsg, $eml,
-                                                       scalar @$msgs);
-       }
-       my ($skel) = delete @$ctx{qw(skel msgs)};
-       $$skel .= "\n</pre>";
+       my ($ctx, $eml) = @_;
+       $ctx->zmore($ctx->html_top) if exists $ctx->{-html_tip};
+       $eml and return PublicInbox::View::eml_entry($ctx, $eml);
+       my $smsg = shift @{$ctx->{msgs}} or
+               $ctx->zmore(${delete($ctx->{skel})});
+       $smsg;
 }
 
 sub ctx_prepare {
@@ -325,7 +321,6 @@ sub adump {
        my ($cb, $mset, $q, $ctx) = @_;
        $ctx->{items} = [ $mset->items ];
        $ctx->{search_query} = $q; # used by WwwAtomStream::atom_header
-       $ctx->{srch} = $ctx->{-inbox}->search;
        PublicInbox::WwwAtomStream->response($ctx, 200, \&adump_i);
 }
 
@@ -333,8 +328,9 @@ sub adump {
 sub adump_i {
        my ($ctx) = @_;
        while (my $mi = shift @{$ctx->{items}}) {
+               my $srch = $ctx->{-inbox}->search(undef, $ctx) or return;
                my $smsg = eval {
-                       PublicInbox::Smsg::from_mitem($mi, $ctx->{srch});
+                       PublicInbox::Smsg::from_mitem($mi, $srch);
                } or next;
                return $smsg;
        }