-# Copyright (C) 2015-2020 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
use PublicInbox::WwwStream qw(html_oneshot);
use PublicInbox::SearchThread;
use PublicInbox::SearchQuery;
-use PublicInbox::Search;
+use PublicInbox::Search qw(get_pct);
my %rmap_inc;
sub mbox_results {
return PublicInbox::WWW::need($ctx, 'Search');
my $q = PublicInbox::SearchQuery->new($ctx->{qp});
my $x = $q->{x};
- my $query = $q->{'q'};
my $o = $q->{o};
my $asc;
if ($o < 0) {
limit => $q->{l},
offset => $o,
relevance => $q->{r},
- thread => $q->{t},
+ threads => $q->{t},
asc => $asc,
};
my ($mset, $total, $err, $html);
retry:
eval {
+ my $query = $q->{'q'};
+ $srch->query_approxidate($ctx->{ibx}->git, $query);
$mset = $srch->mset($query, $opts);
$total = $mset->get_matches_estimated;
};
my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
my @nums = @{$ibx->isrch->mset_to_artnums($mset)};
my %num2msg = map { $_->{num} => $_ } @{$ibx->over->get_all(@nums)};
- my ($min, $max);
+ my ($min, $max, %seen);
foreach my $m ($mset->items) {
- my $rank = sprintf("%${pad}d", $m->get_rank + 1);
- my $pct = get_pct($m);
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};
+ next if $seen{$mid}++;
+ $mid = mid_href($mid);
$ctx->{-t_max} //= $smsg->{ts};
+ my $rank = sprintf("%${pad}d", $m->get_rank + 1);
+ my $pct = get_pct($m);
# only when sorting by relevance, ->items is always
# ordered descending:
$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);
}
my $date = fmt_ts($smsg->{ds});
- my $mid = mid_href($smsg->{mid});
$s = '(no subject)' if $s eq '';
$$res .= qq{$rank. <b><a\nhref="$mid/">}.
$s . "</a></b>\n";
$q->{-min_pct} = $min;
$q->{-max_pct} = $max;
}
- $$res .= search_nav_bot($mset, $q);
+ $$res .= search_nav_bot($ctx, $mset, $q);
undef;
}
sub search_nav_top {
my ($mset, $q, $ctx) = @_;
my $m = $q->qs_html(x => 'm', r => undef, t => undef);
- my $rv = qq{<form\naction="?$m"\nmethod="post"><pre>};
+ my $rv = qq{<form\nid=d\naction="?$m"\nmethod=post><pre>};
my $initial_q = $ctx->{-uxs_retried};
if (defined $initial_q) {
my $rewritten = $q->{'q'};
$rv .= '] view[';
my $x = $q->{x};
- if ($x eq '') {
- my $t = $q->qs_html(x => 't');
- $rv .= qq{<b>summary</b>|<a\nhref="?$t">nested</a>}
- } elsif ($q->{x} eq 't') {
+ my $pfx = "\t\t\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\t\t\tdownload 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} .
qq{|<input\ntype=submit\nname=x\n} .
q{value="full threads"/>};
} else { # BOFH needs to --reindex
- $rv .= qq{\n\t\t\t\t\t\tdownload: } .
+ $rv .= qq{${pfx}download: } .
qq{<input\ntype=submit\nname=z\nvalue="mbox.gz"/>}
}
$rv .= qq{</pre></form><pre>};
}
-sub search_nav_bot {
- my ($mset, $q) = @_;
+sub search_nav_bot { # also used by WwwListing for searching extindex miscidx
+ my ($ctx, $mset, $q) = @_;
my $total = $mset->get_matches_estimated;
my $l = $q->{l};
my $rv = '</pre><hr><pre id=t>';
$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></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]} ]
-}
-
-sub get_pct ($) {
- # Capped at "99%" since "100%" takes an extra column in the
- # thread skeleton view. <xapian/mset.h> says the value isn't
- # very meaningful, anyways.
- my $n = $_[0]->get_percent;
- $n > 99 ? 99 : $n;
+ } @{$_[0]};
}
sub mset_thread {
my $rootset = PublicInbox::SearchThread::thread($msgs,
$r ? \&sort_relevance : \&PublicInbox::View::sort_ds,
$ctx);
- my $skel = search_nav_bot($mset, $q). "<pre>";
+ my $skel = search_nav_bot($ctx, $mset, $q).
+ "<pre>-- links below jump to the message on this page --\n";
+
$ctx->{-upfx} = '';
$ctx->{anchor_idx} = 1;
$ctx->{cur_level} = 0;
@$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;
}
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