package PublicInbox::SearchView;
use strict;
use v5.10.1;
+use List::Util qw(min max);
use URI::Escape qw(uri_unescape);
use PublicInbox::Smsg;
-use PublicInbox::Hval qw(ascii_html obfuscate_addrs mid_href);
+use PublicInbox::Hval qw(ascii_html obfuscate_addrs mid_href fmt_ts);
use PublicInbox::View;
use PublicInbox::WwwAtomStream;
use PublicInbox::WwwStream qw(html_oneshot);
sub mbox_results {
my ($ctx) = @_;
my $q = PublicInbox::SearchQuery->new($ctx->{qp});
- my $x = $q->{x};
+ if ($ctx->{env}->{'psgi.input'}->read(my $buf, 3)) {
+ $q->{t} = 1 if $buf =~ /\Ax=[^0]/;
+ }
require PublicInbox::Mbox;
- return PublicInbox::Mbox::mbox_all($ctx, $q->{'q'}) if $x eq 'm';
- sres_top_html($ctx);
+ $q->{x} eq 'm' ? PublicInbox::Mbox::mbox_all($ctx, $q) :
+ sres_top_html($ctx);
}
sub sres_top_html {
offset => $o,
mset => 1,
relevance => $q->{r},
+ thread => $q->{t},
asc => $asc,
};
my ($mset, $total, $err, $html);
my $pfx = ' ' x $pad;
my $res = \($ctx->{-html_tip});
my $ibx = $ctx->{-inbox};
- my $nshard = $ibx->search->{nshard} // 1;
my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
- my @nums = map { mdocid($nshard, $_) } $mset->items;
+ my @nums = @{$ibx->search->mset_to_artnums($mset)};
my %num2msg = map { $_->{num} => $_ } @{$ibx->over->get_all(@nums)};
+ my ($min, $max);
foreach my $m ($mset->items) {
my $rank = sprintf("%${pad}d", $m->get_rank + 1);
};
next;
};
+ $ctx->{-t_max} //= $smsg->{ts};
+
+ # only when sorting by relevance, ->items is always
+ # ordered descending:
+ $max //= $pct;
+ $min = $pct;
+
my $s = ascii_html($smsg->{subject});
my $f = ascii_html($smsg->{from_name});
if ($obfs_ibx) {
obfuscate_addrs($obfs_ibx, $s);
obfuscate_addrs($obfs_ibx, $f);
}
- my $date = PublicInbox::View::fmt_ts($smsg->{ds});
+ 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";
$$res .= "$pfx - by $f @ $date UTC [$pct%]\n\n";
}
+ if ($q->{r}) { # for descriptions in search_nav_bot
+ $q->{-min_pct} = $min;
+ $q->{-max_pct} = $max;
+ }
$$res .= search_nav_bot($mset, $q);
undef;
}
sub search_nav_top {
my ($mset, $q, $ctx) = @_;
- my $m = $q->qs_html(x => 'm', r => undef);
+ my $m = $q->qs_html(x => 'm', r => undef, t => undef);
my $rv = qq{<form\naction="?$m"\nmethod="post"><pre>};
my $initial_q = $ctx->{-uxs_retried};
if (defined $initial_q) {
}
my $A = $q->qs_html(x => 'A', r => undef);
$rv .= qq{|<a\nhref="?$A">Atom feed</a>]};
- $rv .= qq{\n\t\t\t\t\t\tdownload: };
- $rv .= qq{<input\ntype=submit\nvalue="mbox.gz"/></pre></form><pre>};
+ if ($ctx->{-inbox}->search->has_threadid) {
+ $rv .= qq{\n\t\t\tdownload 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} .
+ q{value="results only"/>} .
+ 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: } .
+ qq{<input\ntype=submit\nname=z\nvalue="mbox.gz"/>}
+ }
+ $rv .= qq{</pre></form><pre>};
}
sub search_nav_bot {
my $beg = $off + 1;
if ($beg <= $end) {
- $rv .= "Results $beg-$end of $total";
- $rv .= ' (estimated)' if $end != $total;
+ my $approx = $end == $total ? '' : '~';
+ $rv .= "Results $beg-$end of $approx$total";
} else {
$rv .= "No more results, only $total";
}
- my ($next, $join, $prev);
+ my ($next, $join, $prev, $nd, $pd);
if ($o >= 0) { # sort descending
my $n = $o + $l;
if ($n < $total) {
$next = $q->qs_html(o => $n, l => $l);
+ $nd = $q->{r} ? "[<= $q->{-min_pct}%]" : '(older)';
}
if ($o > 0) {
- $join = $n < $total ? '/' : ' ';
+ $join = $n < $total ? ' | ' : "\t";
my $p = $o - $l;
$prev = $q->qs_html(o => ($p > 0 ? $p : 0));
+ $pd = $q->{r} ? "[>= $q->{-max_pct}%]" : '(newer)';
}
} else { # o < 0, sort ascending
my $n = $o - $l;
if (-$n < $total) {
$next = $q->qs_html(o => $n, l => $l);
+ $nd = $q->{r} ? "[<= $q->{-min_pct}%]" : '(newer)';
}
if ($o < -1) {
- $join = -$n < $total ? '/' : ' ';
+ $join = -$n < $total ? ' | ' : "\t";
my $p = $o + $l;
$prev = $q->qs_html(o => ($p < 0 ? $p : 0));
+ $pd = $q->{r} ? "[>= $q->{-max_pct}%]" : '(older)';
}
}
- $rv .= qq{ <a\nhref="?$next"\nrel=next>next</a>} if $next;
+ $rv .= qq{ <a\nhref="?$next"\nrel=next>next $nd</a>} if $next;
$rv .= $join if $join;
- $rv .= qq{<a\nhref="?$prev"\nrel=prev>prev</a>} if $prev;
+ $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 results</a></pre>};
+ $rv .= qq{ | <a\nhref="?$rev">reverse</a></pre>};
}
sub sort_relevance {
my $msgs = $ibx->over->get_all(keys %pct);
$_->{pct} = $pct{$_->{num}} for @$msgs;
my $r = $q->{r};
+ if ($r) { # for descriptions in search_nav_bot
+ my @pct = values %pct;
+ $q->{-min_pct} = min(@pct);
+ $q->{-max_pct} = max(@pct);
+ }
my $rootset = PublicInbox::SearchThread::thread($msgs,
$r ? \&sort_relevance : \&PublicInbox::View::sort_ds,
$ctx);
PublicInbox::View::walk_thread($rootset, $ctx,
\&PublicInbox::View::pre_thread);
+ # link $INBOX_DIR/description text to "recent" view around
+ # the newest message in this result set:
+ $ctx->{-t_max} = max(map { delete $_->{ts} } @$msgs);
+
@$msgs = reverse @$msgs if $r;
$ctx->{msgs} = $msgs;
PublicInbox::WwwStream::aresponse($ctx, 200, \&mset_thread_i);
sub adump {
my ($cb, $mset, $q, $ctx) = @_;
- my $nshard = $ctx->{-inbox}->search->{nshard} // 1;
- $ctx->{ids} = [ map { mdocid($nshard, $_) } $mset->items ];
+ $ctx->{ids} = $ctx->{-inbox}->search->mset_to_artnums($mset);
$ctx->{search_query} = $q; # used by WwwAtomStream::atom_header
PublicInbox::WwwAtomStream->response($ctx, 200, \&adump_i);
}