X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=8e33079f1f5d1e100e91aef0242779c764f1f1ab;hb=41fa2087a511d56b4f44271d8ba62675b449bc07;hp=91196ccafc9f21a710b6fe71bafadc18f190315c;hpb=af774d3bb0d728f2f37c418b8c3e215f1d4d860f;p=public-inbox.git

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 91196cca..8e33079f 100644
--- 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
@@ -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{<b>summary</b>|<a\nhref="?$t">nested</a>}
-	} elsif ($x eq '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${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{<input\ntype=submit\nname=z\n} .
@@ -215,14 +218,14 @@ sub search_nav_top {
 			qq{|<input\ntype=submit\nname=x\n} .
 				q{value="full threads"/>};
 	} else { # BOFH needs to --reindex
-		$rv .= qq{\n${pfx}download: } .
+		$rv .= qq{${pfx}download: } .
 			qq{<input\ntype=submit\nname=z\nvalue="mbox.gz"/>}
 	}
 	$rv .= qq{</pre></form><pre>};
 }
 
 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 = '</pre><hr><pre id=t>';
@@ -271,16 +274,17 @@ 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>} .
-		q{ | sort options + mbox downloads } .
-		q{<a href=#d>above</a></pre>};
+	$rv .= qq{ | <a\nhref="?$rev">reverse</a>};
+	exists($ctx->{ibx}) and
+		$rv .= q{ | sort options + mbox downloads <a href=#d>above</a></pre>};
+	$rv;
 }
 
 sub sort_relevance {
-	[ sort {
+	@{$_[0]} = sort {
 		(eval { $b->topmost->{pct} } // 0) <=>
 		(eval { $a->topmost->{pct} } // 0)
-	} @{$_[0]} ]
+	} @{$_[0]};
 }
 
 sub mset_thread {
@@ -298,7 +302,7 @@ 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($ctx, $mset, $q).
 		"<pre>-- links below jump to the message on this page --\n";
 
 	$ctx->{-upfx} = '';
@@ -322,16 +326,16 @@ sub mset_thread {
 
 	@$msgs = reverse @$msgs if $r;
 	$ctx->{msgs} = $msgs;
-	PublicInbox::WwwStream::aresponse($ctx, 200, \&mset_thread_i);
+	PublicInbox::WwwStream::aresponse($ctx, \&mset_thread_i);
 }
 
 # callback for PublicInbox::WwwStream::getline
 sub mset_thread_i {
 	my ($ctx, $eml) = @_;
-	$ctx->zmore($ctx->html_top) if exists $ctx->{-html_tip};
+	print { $ctx->zfh } $ctx->html_top if exists $ctx->{-html_tip};
 	$eml and return PublicInbox::View::eml_entry($ctx, $eml);
 	my $smsg = shift @{$ctx->{msgs}} or
-		$ctx->zmore(${delete($ctx->{skel})});
+		print { $ctx->zfh } ${delete($ctx->{skel})};
 	$smsg;
 }
 
@@ -356,7 +360,7 @@ sub adump {
 	my ($cb, $mset, $q, $ctx) = @_;
 	$ctx->{ids} = $ctx->{ibx}->isrch->mset_to_artnums($mset);
 	$ctx->{search_query} = $q; # used by WwwAtomStream::atom_header
-	PublicInbox::WwwAtomStream->response($ctx, 200, \&adump_i);
+	PublicInbox::WwwAtomStream->response($ctx, \&adump_i);
 }
 
 # callback for PublicInbox::WwwAtomStream::getline