imap+nntp: share COMPRESS implementation

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

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index c0c801b321c6bc389ee1a28bd651e92276b9a3ca..b025ec964b8060157e881272701ebd6a9dd94424 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Displays search results for the web interface
@@ -102,11 +102,8 @@ sub mset_summary {
 
        foreach my $m ($mset->items) {
                my $num = shift @nums;
-               my $smsg = delete($num2msg{$num}) or do {
-                       eval {
-                               $m = "$m $num expired\n";
-                               $ctx->{env}->{'psgi.errors'}->print($m);
-                       };
+               my $smsg = delete($num2msg{$num}) // do {
+                       warn "$m $num expired\n";
                        next;
                };
                my $mid = $smsg->{mid};
@@ -122,7 +119,7 @@ sub mset_summary {
                $min = $pct;
 
                my $s = ascii_html($smsg->{subject});
-               my $f = ascii_html($smsg->{from_name});
+               my $f = ascii_html(delete $smsg->{from_name});
                if ($obfs_ibx) {
                        obfuscate_addrs($obfs_ibx, $s);
                        obfuscate_addrs($obfs_ibx, $f);
@@ -170,7 +167,7 @@ sub err_txt {
 sub search_nav_top {
        my ($mset, $q, $ctx) = @_;
        my $m = $q->qs_html(x => 'm', r => undef, t => undef);
-       my $rv = qq{<form\naction="?$m"\nmethod="post"><pre>};
+       my $rv = qq{<form\nid=d\naction="?$m"\nmethod=post><pre>};
        my $initial_q = $ctx->{-uxs_retried};
        if (defined $initial_q) {
                my $rewritten = $q->{'q'};
@@ -195,17 +192,25 @@ sub search_nav_top {
        $rv .= ']  view[';
 
        my $x = $q->{x};
-       if ($x eq '') {
-               my $t = $q->qs_html(x => 't');
-               $rv .= qq{<b>summary</b>|<a\nhref="?$t">nested</a>}
-       } elsif ($q->{x} eq 't') {
+       my $pfx = "\t\t\t";
+       if ($x eq 't') {
                my $s = $q->qs_html(x => '');
                $rv .= qq{<a\nhref="?$s">summary</a>|<b>nested</b>};
+               $pfx = "thread overview <a\nhref=#t>below</a> | ";
+       } else {
+               my $t = $q->qs_html(x => 't');
+               $rv .= qq{<b>summary</b>|<a\nhref="?$t">nested</a>}
        }
        my $A = $q->qs_html(x => 'A', r => undef);
-       $rv .= qq{|<a\nhref="?$A">Atom feed</a>]};
+       $rv .= qq{|<a\nhref="?$A">Atom feed</a>]\n};
+       $rv .= <<EOM if $x ne 't' && $q->{t};
+*** "t=1" collapses threads in summary, "full threads" requires mbox.gz ***
+EOM
+       $rv .= <<EOM if $x eq 'm';
+*** "x=m" ignored for GET requests, use download buttons below ***
+EOM
        if ($ctx->{ibx}->isrch->has_threadid) {
-               $rv .= qq{\n\t\t\tdownload mbox.gz: } .
+               $rv .= qq{${pfx}download mbox.gz: } .
                        # we set name=z w/o using it since it seems required for
                        # lynx (but works fine for w3m).
                        qq{<input\ntype=submit\nname=z\n} .
@@ -213,7 +218,7 @@ sub search_nav_top {
                        qq{|<input\ntype=submit\nname=x\n} .
                                q{value="full threads"/>};
        } else { # BOFH needs to --reindex
-               $rv .= qq{\n\t\t\t\t\t\tdownload: } .
+               $rv .= qq{${pfx}download: } .
                        qq{<input\ntype=submit\nname=z\nvalue="mbox.gz"/>}
        }
        $rv .= qq{</pre></form><pre>};
@@ -269,14 +274,16 @@ sub search_nav_bot { # also used by WwwListing for searching extindex miscidx
        $rv .= qq{<a\nhref="?$prev"\nrel=prev>prev $pd</a>} if $prev;
 
        my $rev = $q->qs_html(o => $o < 0 ? 0 : -1);
-       $rv .= qq{ | <a\nhref="?$rev">reverse</a></pre>};
+       $rv .= qq{ | <a\nhref="?$rev">reverse</a>} .
+               q{ | sort options + mbox downloads } .
+               q{<a href=#d>above</a></pre>};
 }
 
 sub sort_relevance {
-       [ sort {
+       @{$_[0]} = sort {
                (eval { $b->topmost->{pct} } // 0) <=>
                (eval { $a->topmost->{pct} } // 0)
-       } @{$_[0]} ]
+       } @{$_[0]};
 }
 
 sub mset_thread {
@@ -294,7 +301,9 @@ sub mset_thread {
        my $rootset = PublicInbox::SearchThread::thread($msgs,
                $r ? \&sort_relevance : \&PublicInbox::View::sort_ds,
                $ctx);
-       my $skel = search_nav_bot($mset, $q). "<pre>";
+       my $skel = search_nav_bot($mset, $q).
+               "<pre>-- links below jump to the message on this page --\n";
+
        $ctx->{-upfx} = '';
        $ctx->{anchor_idx} = 1;
        $ctx->{cur_level} = 0;