#
# 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{};
@@ -269,14 +274,16 @@ sub search_nav_bot { # also used by WwwListing for searching extindex miscidx
$rv .= qq{prev $pd} if $prev;
my $rev = $q->qs_html(o => $o < 0 ? 0 : -1);
- $rv .= qq{ | reverse
};
+ $rv .= qq{ | reverse} .
+ q{ | sort options + mbox downloads } .
+ q{above};
}
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). "";
+ my $skel = search_nav_bot($mset, $q).
+ "-- links below jump to the message on this page --\n";
+
$ctx->{-upfx} = '';
$ctx->{anchor_idx} = 1;
$ctx->{cur_level} = 0;