www: reduce long-lived PublicInbox::Search references

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

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 115321c610f70be296f46dcf1b2de38512fcd006..a83c0356d3ab7d2ac81d9fa90da520fc8e589036 100644 (file)
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -29,7 +29,7 @@ sub getline {
        }
 }
 
-# called by PublicInbox::DS::write
+# called by PublicInbox::DS::write after http->next_step
 sub async_next {
        my ($http) = @_; # PublicInbox::HTTP
        my $ctx = $http->{forward} or return; # client aborted
@@ -40,7 +40,7 @@ sub async_next {
        warn "E: $@" if $@;
 }
 
-sub async_eml { # ->{async_eml} for async_blob_cb
+sub async_eml { # for async_blob_cb
        my ($ctx, $eml) = @_;
        my $smsg = delete $ctx->{smsg};
        # next message
@@ -87,7 +87,7 @@ sub emit_raw {
        my $smsg = $ctx->{smsg} = $over->next_by_mid(@$mip) or return;
        my $res_hdr = res_hdr($ctx, $smsg->{subject});
        bless $ctx, __PACKAGE__;
-       $ctx->psgi_response(200, $res_hdr, \&async_next, \&async_eml);
+       $ctx->psgi_response(200, $res_hdr);
 }
 
 sub msg_hdr ($$;$) {
@@ -205,8 +205,8 @@ sub mbox_all_ids {
 
 sub results_cb {
        my ($ctx) = @_;
+       my $srch = $ctx->{-inbox}->search(undef, $ctx) or return;
        my $mset = $ctx->{mset};
-       my $srch = $ctx->{srch};
        while (1) {
                while (my $mi = (($mset->items)[$ctx->{iter}++])) {
                        my $smsg = PublicInbox::Smsg::from_mitem($mi,
@@ -227,8 +227,8 @@ sub mbox_all {
 
        return mbox_all_ids($ctx) if $query eq '';
        my $qopts = $ctx->{qopts} = { mset => 2 };
-       my $srch = $ctx->{srch} = $ctx->{-inbox}->search or
-               return PublicInbox::WWW::need($ctx, 'Search');;
+       my $srch = $ctx->{-inbox}->search or
+               return PublicInbox::WWW::need($ctx, 'Search');
        my $mset = $ctx->{mset} = $srch->query($query, $qopts);
        $qopts->{offset} = $mset->size or
                        return [404, [qw(Content-Type text/plain)],