thread: avoid Perl5 internal scratchpad target cache

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

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 08c77f35000e00d878746576599123bb377ffaed..b1cdb480d75d2ef97a76d024ab95ad8736f85f52 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -34,7 +34,6 @@ sub sres_top_html {
                return PublicInbox::WWW::need($ctx, 'Search');
        my $q = PublicInbox::SearchQuery->new($ctx->{qp});
        my $x = $q->{x};
-       my $query = $q->{'q'};
        my $o = $q->{o};
        my $asc;
        if ($o < 0) {
@@ -54,6 +53,8 @@ sub sres_top_html {
        my ($mset, $total, $err, $html);
 retry:
        eval {
+               my $query = $q->{'q'};
+               $srch->query_approxidate($ctx->{ibx}->git, $query);
                $mset = $srch->mset($query, $opts);
                $total = $mset->get_matches_estimated;
        };
@@ -97,20 +98,20 @@ sub mset_summary {
        my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
        my @nums = @{$ibx->isrch->mset_to_artnums($mset)};
        my %num2msg = map { $_->{num} => $_ } @{$ibx->over->get_all(@nums)};
-       my ($min, $max);
+       my ($min, $max, %seen);
 
        foreach my $m ($mset->items) {
-               my $rank = sprintf("%${pad}d", $m->get_rank + 1);
-               my $pct = get_pct($m);
                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};
+               next if $seen{$mid}++;
+               $mid = mid_href($mid);
                $ctx->{-t_max} //= $smsg->{ts};
+               my $rank = sprintf("%${pad}d", $m->get_rank + 1);
+               my $pct = get_pct($m);
 
                # only when sorting by relevance, ->items is always
                # ordered descending:
@@ -118,13 +119,12 @@ 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);
                }
                my $date = fmt_ts($smsg->{ds});
-               my $mid = mid_href($smsg->{mid});
                $s = '(no subject)' if $s eq '';
                $$res .= qq{$rank. <b><a\nhref="$mid/">}.
                        $s . "</a></b>\n";
@@ -167,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'};
@@ -192,17 +192,19 @@ sub search_nav_top {
        $rv .= ']  view[';
 
        my $x = $q->{x};
+       my $pfx = "\t\t\t";
        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') {
+       } elsif ($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> | ";
        }
        my $A = $q->qs_html(x => 'A', r => undef);
        $rv .= qq{|<a\nhref="?$A">Atom feed</a>]};
        if ($ctx->{ibx}->isrch->has_threadid) {
-               $rv .= qq{\n\t\t\tdownload mbox.gz: } .
+               $rv .= qq{\n${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} .
@@ -210,13 +212,13 @@ 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{\n${pfx}download: } .
                        qq{<input\ntype=submit\nname=z\nvalue="mbox.gz"/>}
        }
        $rv .= qq{</pre></form><pre>};
 }
 
-sub search_nav_bot {
+sub search_nav_bot { # also used by WwwListing for searching extindex miscidx
        my ($mset, $q) = @_;
        my $total = $mset->get_matches_estimated;
        my $l = $q->{l};
@@ -266,14 +268,16 @@ sub search_nav_bot {
        $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 {
@@ -291,7 +295,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;