};
my $initial_q = $ctx->{-uxs_retried};
if (defined $initial_q) {
@@ -188,8 +202,19 @@ sub search_nav_top {
}
my $A = $q->qs_html(x => 'A', r => undef);
$rv .= qq{|Atom feed]};
- $rv .= qq{\n\t\t\t\t\t\tdownload: };
- $rv .= qq{};
+ 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{} .
+ qq{|};
+ } else { # BOFH needs to --reindex
+ $rv .= qq{\n\t\t\t\t\t\tdownload: } .
+ qq{}
+ }
+ $rv .= qq{};
}
sub search_nav_bot {
@@ -203,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 {
@@ -256,21 +285,19 @@ sub get_pct ($) {
$n > 99 ? 99 : $n;
}
-sub load_msgs {
- my ($mset) = @_;
- [ map {
- my $mi = $_;
- my $smsg = PublicInbox::Smsg::from_mitem($mi);
- $smsg->{pct} = get_pct($mi);
- $smsg;
- } ($mset->items) ]
-}
-
sub mset_thread {
my ($ctx, $mset, $q) = @_;
my $ibx = $ctx->{-inbox};
- my $msgs = $ibx->search->retry_reopen(\&load_msgs, $mset);
+ my $nshard = $ibx->search->{nshard} // 1;
+ my %pct = map { mdocid($nshard, $_) => get_pct($_) } $mset->items;
+ 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);
@@ -290,22 +317,23 @@ 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;
- \&mset_thread_i;
+ PublicInbox::WwwStream::aresponse($ctx, 200, \&mset_thread_i);
}
# callback for PublicInbox::WwwStream::getline
sub mset_thread_i {
- my ($nr, $ctx) = @_;
- my $msgs = $ctx->{msgs} or return;
- while (my $smsg = pop @$msgs) {
- $ctx->{-inbox}->smsg_mime($smsg) or next;
- return PublicInbox::View::index_entry($smsg, $ctx,
- scalar @$msgs);
- }
- my ($skel) = delete @$ctx{qw(skel msgs)};
- $$skel .= "\n";
+ my ($ctx, $eml) = @_;
+ $ctx->zmore($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})});
+ $smsg;
}
sub ctx_prepare {
@@ -327,68 +355,18 @@ sub ctx_prepare {
sub adump {
my ($cb, $mset, $q, $ctx) = @_;
- $ctx->{items} = [ $mset->items ];
+ $ctx->{ids} = $ctx->{-inbox}->search->mset_to_artnums($mset);
$ctx->{search_query} = $q; # used by WwwAtomStream::atom_header
- $ctx->{srch} = $ctx->{-inbox}->search;
PublicInbox::WwwAtomStream->response($ctx, 200, \&adump_i);
}
# callback for PublicInbox::WwwAtomStream::getline
sub adump_i {
my ($ctx) = @_;
- while (my $mi = shift @{$ctx->{items}}) {
- my $smsg = eval {
- PublicInbox::Smsg::from_mitem($mi, $ctx->{srch});
- } or next;
+ while (my $num = shift @{$ctx->{ids}}) {
+ my $smsg = eval { $ctx->{-inbox}->over->get_art($num) } or next;
return $smsg;
}
}
-package PublicInbox::SearchQuery;
-use strict;
-use warnings;
-use URI::Escape qw(uri_escape);
-use PublicInbox::MID qw(MID_ESC);
-
-sub new {
- my ($class, $qp) = @_;
-
- my $r = $qp->{r};
- my ($l) = (($qp->{l} || '') =~ /([0-9]+)/);
- $l = $LIM if !$l || $l > $LIM;
- bless {
- q => $qp->{'q'},
- x => $qp->{x} || '',
- o => (($qp->{o} || '0') =~ /(-?[0-9]+)/),
- l => $l,
- r => (defined $r && $r ne '0'),
- }, $class;
-}
-
-sub qs_html {
- my ($self, %override) = @_;
-
- if (scalar(keys(%override))) {
- $self = bless { (%$self, %override) }, ref($self);
- }
-
- my $q = uri_escape($self->{'q'}, MID_ESC);
- $q =~ s/%20/+/g; # improve URL readability
- my $qs = "q=$q";
-
- if (my $o = $self->{o}) { # ignore o == 0
- $qs .= "&o=$o";
- }
- if (my $l = $self->{l}) {
- $qs .= "&l=$l" unless $l == $LIM;
- }
- if (my $r = $self->{r}) {
- $qs .= "&r";
- }
- if (my $x = $self->{x}) {
- $qs .= "&x=$x" if ($x eq 't' || $x eq 'A' || $x eq 'm');
- }
- $qs;
-}
-
1;