use PublicInbox::SearchMsg;
use PublicInbox::Hval qw/ascii_html/;
use PublicInbox::View;
-use PublicInbox::MID qw(mid2path mid_mime mid_clean);
+use PublicInbox::MID qw(mid2path mid_mime mid_clean mid_escape);
use Email::MIME;
require PublicInbox::Git;
-require PublicInbox::Thread;
+require PublicInbox::SearchThread;
our $LIM = 50;
sub noop {}
my $s = ascii_html($smsg->subject);
my $f = ascii_html($smsg->from_name);
my $ts = PublicInbox::View::fmt_ts($smsg->ts);
- my $mid = PublicInbox::Hval->new_msgid($smsg->mid)->as_href;
+ my $mid = PublicInbox::Hval->new_msgid($smsg->mid)->{href};
$$res .= qq{$rank. <b><a\nhref="$mid/">}.
$s . "</a></b>\n";
$$res .= "$pfx - by $f @ $ts UTC [$pct%]\n\n";
sub err_txt {
my ($ctx, $err) = @_;
- my $u = '//xapian.org/docs/queryparser.html';
- $u = PublicInbox::Hval::prurl($ctx->{env}, $u);
+ my $u = $ctx->{-inbox}->base_url($ctx->{env}) . '_/text/help/';
$err =~ s/^\s*Exception:\s*//; # bad word to show users :P
$err = ascii_html($err);
"\nBad query: <b>$err</b>\n" .
- qq{See <a\nhref="$u">$u</a> for Xapian query syntax};
+ qq{See <a\nhref="$u">$u</a> for help on using search};
}
sub search_nav_top {
$m;
} ($mset->items);
- my $th = PublicInbox::Thread->new(@m);
+ my $th = PublicInbox::SearchThread->new(\@m);
$th->thread;
if ($q->{r}) { # order by relevance
$th->order(sub {
use strict;
use warnings;
use PublicInbox::Hval;
+use PublicInbox::MID qw(mid_escape);
sub new {
my ($class, $qp) = @_;
$self = $tmp;
}
- my $q = PublicInbox::Hval->new($self->{'q'})->as_href;
+ my $q = mid_escape($self->{'q'});
$q =~ s/%20/+/g; # improve URL readability
my $qs = "q=$q";