}.
@@ -93,9 +138,22 @@ sub err_txt {
}
sub search_nav_top {
- my ($mset, $q) = @_;
+ my ($mset, $q, $ctx) = @_;
+ my $m = $q->qs_html(x => 'm', r => undef);
+ my $rv = qq{};
}
sub search_nav_bot {
@@ -123,46 +183,54 @@ sub search_nav_bot {
my $total = $mset->get_matches_estimated;
my $nr = scalar $mset->items;
my $o = $q->{o};
+ my $l = $q->{l};
my $end = $o + $nr;
my $beg = $o + 1;
- my $rv = "
Results $beg-$end of $total";
- my $n = $o + $LIM;
+ my $rv = '
';
+ if ($beg <= $end) {
+ $rv .= "Results $beg-$end of $total";
+ $rv .= ' (estimated)' if $end != $total;
+ } else {
+ $rv .= "No more results, only $total";
+ }
+ my $n = $o + $l;
if ($n < $total) {
- my $qs = $q->qs_html(o => $n);
- $rv .= qq{, next}
+ my $qs = $q->qs_html(o => $n, l => $l);
+ $rv .= qq{ next}
}
if ($o > 0) {
- $rv .= $n < $total ? '/' : ', ';
- my $p = $o - $LIM;
+ $rv .= $n < $total ? '/' : ' ';
+ my $p = $o - $l;
my $qs = $q->qs_html(o => ($p > 0 ? $p : 0));
$rv .= qq{prev};
}
$rv .= '
';
}
+sub sort_relevance {
+ my ($pct) = @_;
+ sub {
+ [ sort { (eval { $pct->{$b->topmost->{id}} } || 0)
+ <=>
+ (eval { $pct->{$a->topmost->{id}} } || 0)
+ } @{$_[0]} ] };
+}
+
sub mset_thread {
my ($ctx, $mset, $q) = @_;
my %pct;
- my @m = map {
+ my $srch = $ctx->{srch};
+ my $msgs = $srch->retry_reopen(sub { [ map {
my $i = $_;
- my $m = PublicInbox::SearchMsg->load_doc($i->get_document);
- $pct{$m->mid} = $i->get_percent;
- $m;
- } ($mset->items);
-
- my $th = PublicInbox::SearchThread->new(\@m);
- $th->thread;
- if ($q->{r}) { # order by relevance
- $th->order(sub {
- [ sort { (eval { $pct{$b->topmost->{id}} } || 0)
- <=>
- (eval { $pct{$a->topmost->{id}} } || 0)
- } @{$_[0]} ];
- });
- } else { # order by time (default for threaded view)
- $th->order(*PublicInbox::View::sort_ts);
- }
+ my $smsg = PublicInbox::SearchMsg->load_doc($i->get_document);
+ $pct{$smsg->mid} = $i->get_percent;
+ $smsg;
+ } ($mset->items) ]});
+ my $r = $q->{r};
+ my $rootset = PublicInbox::SearchThread::thread($msgs,
+ $r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ts,
+ $srch);
my $skel = search_nav_bot($mset, $q). "";
my $inbox = $ctx->{-inbox};
$ctx->{-upfx} = '';
@@ -174,20 +242,22 @@ sub mset_thread {
$ctx->{prev_attr} = '';
$ctx->{prev_level} = 0;
$ctx->{seen} = {};
- $ctx->{s_nr} = scalar(@m).'+ results';
+ $ctx->{s_nr} = scalar(@$msgs).'+ results';
- PublicInbox::View::walk_thread($th, $ctx,
+ # reduce hash lookups in skel_dump
+ $ctx->{-obfuscate} = $ctx->{-inbox}->{obfuscate};
+ PublicInbox::View::walk_thread($rootset, $ctx,
*PublicInbox::View::pre_thread);
- my $msgs = \@m;
+ @$msgs = reverse @$msgs if $r;
my $mime;
sub {
return unless $msgs;
- while ($mime = shift @$msgs) {
+ while ($mime = pop @$msgs) {
$mime = $inbox->msg_by_smsg($mime) and last;
}
if ($mime) {
- $mime = Email::MIME->new($mime);
+ $mime = PublicInbox::MIME->new($mime);
return PublicInbox::View::index_entry($mime, $ctx,
scalar @$msgs);
}
@@ -198,7 +268,9 @@ sub mset_thread {
sub ctx_prepare {
my ($q, $ctx) = @_;
- my $qh = ascii_html($q->{'q'});
+ my $qh = $q->{'q'};
+ utf8::decode($qh);
+ $qh = ascii_html($qh);
$ctx->{-q_value_html} = $qh;
$ctx->{-atom} = '?'.$q->qs_html(x => 'A', r => undef);
$ctx->{-title_html} = "$qh - search results";
@@ -213,39 +285,38 @@ sub ctx_prepare {
sub adump {
my ($cb, $mset, $q, $ctx) = @_;
- my $fh = $cb->([ 200, ['Content-Type' => 'application/atom+xml']]);
my $ibx = $ctx->{-inbox};
- my $feed_opts = PublicInbox::Feed::get_feedopts($ctx);
- my $x = ascii_html($q->{'q'});
- $x = qq{$x - search results};
- $feed_opts->{atomurl} = $feed_opts->{url} . '?'. $q->qs_html;
- $feed_opts->{url} .= '?'. $q->qs_html(x => undef);
- $x = PublicInbox::Feed::atom_header($feed_opts, $x);
- $fh->write($x. PublicInbox::Feed::feed_updated());
-
- for ($mset->items) {
- $x = PublicInbox::SearchMsg->load_doc($_->get_document)->mid;
- $x = mid2path($x);
- my $s = PublicInbox::Feed::feed_entry($feed_opts, $x, $ibx);
- $fh->write($s) if defined $s;
- }
- PublicInbox::Feed::end_feed($fh);
+ my @items = $mset->items;
+ $ctx->{search_query} = $q;
+ my $srch = $ctx->{srch};
+ PublicInbox::WwwAtomStream->response($ctx, 200, sub {
+ while (my $x = shift @items) {
+ $x = load_doc_retry($srch, $x);
+ $x = $ibx->msg_by_smsg($x) and
+ return PublicInbox::MIME->new($x);
+ }
+ return undef;
+ });
}
package PublicInbox::SearchQuery;
use strict;
use warnings;
+use URI::Escape qw(uri_escape);
use PublicInbox::Hval;
-use PublicInbox::MID qw(mid_escape);
+use PublicInbox::MID qw(MID_ESC);
sub new {
my ($class, $qp) = @_;
my $r = $qp->{r};
+ my ($l) = (($qp->{l} || '') =~ /(\d+)/);
+ $l = $LIM if !$l || $l > $LIM;
bless {
q => $qp->{'q'},
x => $qp->{x} || '',
o => (($qp->{o} || '0') =~ /(\d+)/),
+ l => $l,
r => (defined $r && $r ne '0'),
}, $class;
}
@@ -261,18 +332,21 @@ sub qs_html {
$self = $tmp;
}
- my $q = mid_escape($self->{'q'});
+ 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";
+ }
if (my $r = $self->{r}) {
$qs .= "&r";
}
if (my $x = $self->{x}) {
- $qs .= "&x=$x" if ($x eq 't' || $x eq 'A');
+ $qs .= "&x=$x" if ($x eq 't' || $x eq 'A' || $x eq 'm');
}
$qs;
}