X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=07fef40ccccc42b34f46da8c83add5bbf1d79a72;hb=1e0709d33ca040b8b1ac6b84e5b07a4cee3a6ced;hp=91196ccafc9f21a710b6fe71bafadc18f190315c;hpb=af774d3bb0d728f2f37c418b8c3e215f1d4d860f;p=public-inbox.git
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 91196cca..07fef40c 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
#
# Displays search results for the web interface
@@ -34,7 +34,7 @@ sub sres_top_html {
return PublicInbox::WWW::need($ctx, 'Search');
my $q = PublicInbox::SearchQuery->new($ctx->{qp});
my $x = $q->{x};
- my $o = $q->{o};
+ my $o = $q->{o} // 0;
my $asc;
if ($o < 0) {
$asc = 1;
@@ -82,7 +82,7 @@ retry:
mset_summary($ctx, $mset, $q); # appends to {-html_tip}
$html = '';
}
- html_oneshot($ctx, $code);
+ html_oneshot($ctx, $code, $html);
}
# display non-nested search results similar to what users expect from
@@ -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);
@@ -137,7 +134,7 @@ sub mset_summary {
$q->{-min_pct} = $min;
$q->{-max_pct} = $max;
}
- $$res .= search_nav_bot($mset, $q);
+ $$res .= search_nav_bot($ctx, $mset, $q);
undef;
}
@@ -196,18 +193,24 @@ sub search_nav_top {
my $x = $q->{x};
my $pfx = "\t\t\t";
- if ($x eq '') {
- my $t = $q->qs_html(x => 't');
- $rv .= qq{summary|nested}
- } elsif ($x eq 't') {
+ if ($x eq 't') {
my $s = $q->qs_html(x => '');
$rv .= qq{summary|nested};
$pfx = "thread overview below | ";
+ } else {
+ my $t = $q->qs_html(x => 't');
+ $rv .= qq{summary|nested}
}
my $A = $q->qs_html(x => 'A', r => undef);
- $rv .= qq{|Atom feed]};
+ $rv .= qq{|Atom feed]\n};
+ $rv .= <{t};
+*** "t=1" collapses threads in summary, "full threads" requires mbox.gz ***
+EOM
+ $rv .= <{ibx}->isrch->has_threadid) {
- $rv .= qq{\n${pfx}download 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{};
} else { # BOFH needs to --reindex
- $rv .= qq{\n${pfx}download: } .
+ $rv .= qq{${pfx}download: } .
qq{}
}
$rv .= qq{
};
}
sub search_nav_bot { # also used by WwwListing for searching extindex miscidx
- my ($mset, $q) = @_;
+ my ($ctx, $mset, $q) = @_;
my $total = $mset->get_matches_estimated;
my $l = $q->{l};
my $rv = '
';
@@ -271,16 +274,17 @@ 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} .
- q{ | sort options + mbox downloads } .
- q{above