X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=07fef40ccccc42b34f46da8c83add5bbf1d79a72;hb=1e0709d33ca040b8b1ac6b84e5b07a4cee3a6ced;hp=b025ec964b8060157e881272701ebd6a9dd94424;hpb=5f28e29a9cac8d0f61af4212895585ad930bc370;p=public-inbox.git

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index b025ec96..07fef40c 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -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
@@ -134,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;
 }
 
@@ -225,7 +225,7 @@ EOM
 }
 
 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>';
@@ -274,9 +274,10 @@ 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 {
@@ -301,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} = '';
@@ -325,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;
 }
 
@@ -359,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