searchview: fix mbox.gz downloads for lynx users

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

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 28d9ce5dd940ba337079ba39f2ae61fadec056b4..75e2d39dfe3057ca6e94c6b1e21b7bf24591e073 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -13,6 +13,7 @@ use PublicInbox::WwwAtomStream;
 use PublicInbox::WwwStream qw(html_oneshot);
 use PublicInbox::SearchThread;
 use PublicInbox::SearchQuery;
+use PublicInbox::Search qw(mdocid);
 my %rmap_inc;
 
 sub mbox_results {
@@ -90,19 +91,21 @@ sub mset_summary {
        my $pfx = ' ' x $pad;
        my $res = \($ctx->{-html_tip});
        my $ibx = $ctx->{-inbox};
-       my $srch = $ibx->search;
        my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
+       my @nums = @{$ibx->search->mset_to_artnums($mset)};
+       my %num2msg = map { $_->{num} => $_ } @{$ibx->over->get_all(@nums)};
+
        foreach my $m ($mset->items) {
                my $rank = sprintf("%${pad}d", $m->get_rank + 1);
                my $pct = get_pct($m);
-               my $smsg = PublicInbox::Smsg::from_mitem($m, $srch);
-               unless ($smsg) {
+               my $num = shift @nums;
+               my $smsg = delete($num2msg{$num}) or do {
                        eval {
-                               $m = "$m ".$m->get_docid . " expired\n";
+                               $m = "$m $num expired\n";
                                $ctx->{env}->{'psgi.errors'}->print($m);
                        };
                        next;
-               }
+               };
                my $s = ascii_html($smsg->{subject});
                my $f = ascii_html($smsg->{from_name});
                if ($obfs_ibx) {
@@ -182,9 +185,11 @@ sub search_nav_top {
                $rv .= qq{<a\nhref="?$s">summary</a>|<b>nested</b>};
        }
        my $A = $q->qs_html(x => 'A', r => undef);
-       $rv .= qq{|<a\nhref="?$A">Atom feed</a>]};
-       $rv .= qq{\n\t\t\t\t\t\tdownload: };
-       $rv .= qq{<input\ntype=submit\nvalue="mbox.gz"/></pre></form><pre>};
+       $rv .= qq{|<a\nhref="?$A">Atom feed</a>]} .
+               qq{\n\t\t\t\t\t\tdownload: } .
+               # lynx seems to require a name=, here, so just use 'z'
+               qq{<input\ntype=submit\nname=z\nvalue="mbox.gz"/>} .
+               q{</pre></form><pre>};
 }
 
 sub search_nav_bot {
@@ -251,20 +256,13 @@ sub get_pct ($) {
        $n > 99 ? 99 : $n;
 }
 
-sub load_msgs {
-       my ($mset) = @_;
-       [ map {
-               my $mi = $_;
-               my $smsg = PublicInbox::Smsg::from_mitem($mi);
-               $smsg->{pct} = get_pct($mi);
-               $smsg;
-       } ($mset->items) ]
-}
-
 sub mset_thread {
        my ($ctx, $mset, $q) = @_;
        my $ibx = $ctx->{-inbox};
-       my $msgs = $ibx->search->retry_reopen(\&load_msgs, $mset);
+       my $nshard = $ibx->search->{nshard} // 1;
+       my %pct = map { mdocid($nshard, $_) => get_pct($_) } $mset->items;
+       my $msgs = $ibx->over->get_all(keys %pct);
+       $_->{pct} = $pct{$_->{num}} for @$msgs;
        my $r = $q->{r};
        my $rootset = PublicInbox::SearchThread::thread($msgs,
                $r ? \&sort_relevance : \&PublicInbox::View::sort_ds,
@@ -319,7 +317,7 @@ sub ctx_prepare {
 
 sub adump {
        my ($cb, $mset, $q, $ctx) = @_;
-       $ctx->{items} = [ $mset->items ];
+       $ctx->{ids} = $ctx->{-inbox}->search->mset_to_artnums($mset);
        $ctx->{search_query} = $q; # used by WwwAtomStream::atom_header
        PublicInbox::WwwAtomStream->response($ctx, 200, \&adump_i);
 }
@@ -327,11 +325,8 @@ sub adump {
 # callback for PublicInbox::WwwAtomStream::getline
 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, $srch);
-               } or next;
+       while (my $num = shift @{$ctx->{ids}}) {
+               my $smsg = eval { $ctx->{-inbox}->over->get_art($num) } or next;
                return $smsg;
        }
 }