X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=07fef40ccccc42b34f46da8c83add5bbf1d79a72;hb=1e0709d33ca040b8b1ac6b84e5b07a4cee3a6ced;hp=b1cdb480d75d2ef97a76d024ab95ad8736f85f52;hpb=08b543eb6c67cc19ea8e86afe6b9494df79e2fea;p=public-inbox.git
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index b1cdb480..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
@@ -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;
}
@@ -193,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 = '
';
@@ -268,9 +274,10 @@ 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
};
+ $rv .= qq{ | reverse};
+ exists($ctx->{ibx}) and
+ $rv .= q{ | sort options + mbox downloads above};
+ $rv;
}
sub sort_relevance {
@@ -295,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).
"
-- links below jump to the message on this page --\n";
$ctx->{-upfx} = '';
@@ -319,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;
}
@@ -353,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