X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchView.pm;h=892e8fdae14038098bc9cd9ae21f5dcd97b2a1fc;hb=68f9da93b11412122fff6e6154a42ecabcdbada0;hp=76428dfbdbc455127161fbc8f76df67c5e7e6308;hpb=a367ec1b15a2458e532245f5308565dd84f8ca63;p=public-inbox.git
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 76428dfb..892e8fda 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -5,9 +5,10 @@
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);
@@ -97,6 +98,7 @@ sub mset_summary {
my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
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);
@@ -109,19 +111,30 @@ sub mset_summary {
};
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. }.
$s . "\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;
}
@@ -215,42 +228,46 @@ 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{ next} if $next;
+ $rv .= qq{ next $nd} if $next;
$rv .= $join if $join;
- $rv .= qq{prev} if $prev;
+ $rv .= qq{prev $pd} if $prev;
my $rev = $q->qs_html(o => $o < 0 ? 0 : -1);
- $rv .= qq{ | reverse results};
+ $rv .= qq{ | reverse};
}
sub sort_relevance {
@@ -276,6 +293,11 @@ sub mset_thread {
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);
@@ -295,6 +317,10 @@ sub mset_thread {
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);