sub query {
my ($self, $query_string, $opts) = @_;
$opts ||= {};
- if ($query_string eq '' && !$opts->{mset}) {
- $self->{over_ro}->recent($opts);
- } else {
- my $qp = $self->{qp} //= qparse_new($self);
- my $qp_flags = $self->{qp_flags};
- my $query = $qp->parse_query($query_string, $qp_flags);
- $opts->{relevance} = 1 unless exists $opts->{relevance};
- _do_enquire($self, $query, $opts);
- }
+ my $qp = $self->{qp} //= qparse_new($self);
+ my $query = $qp->parse_query($query_string, $self->{qp_flags});
+ $opts->{relevance} = 1 unless exists $opts->{relevance};
+ _do_enquire($self, $query, $opts);
}
sub retry_reopen {
if ($V == 1) {
ok(run_script([ '-index', "$tmpdir/inbox" ]), 'v1 indexed');
}
-my $msgs = $ibx->search->query('');
+my $msgs = $ibx->over->recent;
is(scalar(@$msgs), 1, 'only got one message');
my $eml = $ibx->smsg_eml($msgs->[0]);
is($eml->as_string, $mime->as_string, 'injected message');
ok(run_script(['-mda'], undef, $rdr), 'mda did not die on "spam"');
@new = glob("$faildir/new/*");
is(scalar(@new), 1, 'got a message in faildir');
- $msgs = $ibx->search->reopen->query('');
+ $msgs = $ibx->over->recent;
is(scalar(@$msgs), 1, 'no new message');
my $config = "$ENV{PI_DIR}/config";
ok(run_script(['-mda'], undef, $rdr), 'mda did not die');
my @again = glob("$faildir/new/*");
is_deeply(\@again, \@new, 'no new message in faildir');
- $msgs = $ibx->search->reopen->query('');
+ $msgs = $ibx->over->recent;
is(scalar(@$msgs), 2, 'new message added OK');
}
my $config = PublicInbox::Config->new(\$orig);
my $ibx = $config->lookup_name('test');
ok($ibx, 'found inbox by name');
-my $srch = $ibx->search;
PublicInbox::Watch->new($config)->scan('full');
-my $total = scalar @{$srch->reopen->query('')};
+my $total = scalar @{$ibx->over->recent};
is($total, 1, 'got one revision');
# my $git = PublicInbox::Git->new("$inboxdir/git/0.git");
$write_spam->();
is(unlink(glob("$maildir/new/*")), 1, 'unlinked old spam');
PublicInbox::Watch->new($config)->scan('full');
-is_deeply($srch->reopen->query(''), [], 'deleted file');
+is_deeply($ibx->over->recent, [], 'deleted file');
is(unlink(glob("$spamdir/cur/*")), 1, 'unlinked trained spam');
# check with scrubbing
More majordomo info at http://vger.kernel.org/majordomo-info.html\n);
PublicInbox::Emergency->new($maildir)->prepare(\$msg);
PublicInbox::Watch->new($config)->scan('full');
- my $msgs = $srch->reopen->query('');
+ my $msgs = $ibx->over->recent;
is(scalar(@$msgs), 1, 'got one file back');
my $mref = $ibx->msg_by_smsg($msgs->[0]);
like($$mref, qr/something\n\z/s, 'message scrubbed on import');
is(unlink(glob("$maildir/new/*")), 1, 'unlinked spam');
$write_spam->();
PublicInbox::Watch->new($config)->scan('full');
- $msgs = $srch->reopen->query('');
+ $msgs = $ibx->over->recent;
is(scalar(@$msgs), 0, 'inbox is empty again');
is(unlink(glob("$spamdir/cur/*")), 1, 'unlinked trained spam');
}
local $SIG{__WARN__} = sub {}; # quiet spam check warning
PublicInbox::Watch->new($config)->scan('full');
}
- my $msgs = $srch->reopen->query('');
+ my $msgs = $ibx->over->recent;
is(scalar(@$msgs), 0, 'inbox is still empty');
is(unlink(glob("$maildir/new/*")), 1);
}
PublicInbox::Emergency->new($maildir)->prepare(\$msg);
$config->{'publicinboxwatch.spamcheck'} = 'spamc';
PublicInbox::Watch->new($config)->scan('full');
- my $msgs = $srch->reopen->query('');
+ my $msgs = $ibx->over->recent;
is(scalar(@$msgs), 1, 'inbox has one mail after spamc OK-ed a message');
my $mref = $ibx->msg_by_smsg($msgs->[0]);
like($$mref, qr/something\n\z/s, 'message scrubbed on import');
$msg = do { local $/; <$fh> };
PublicInbox::Emergency->new($maildir)->prepare(\$msg);
PublicInbox::Watch->new($config)->scan('full');
- my $msgs = $srch->reopen->query('dfpost:6e006fd7');
+ my $msgs = $ibx->search->reopen->query('dfpost:6e006fd7');
is(scalar(@$msgs), 1, 'diff postimage found');
my $post = $msgs->[0];
- $msgs = $srch->query('dfpre:090d998b6c2c');
+ $msgs = $ibx->search->query('dfpre:090d998b6c2c');
is(scalar(@$msgs), 1, 'diff preimage found');
is($post->{blob}, $msgs->[0]->{blob}, 'same message');
}
EOF
PublicInbox::Emergency->new($maildir)->prepare(\$both);
PublicInbox::Watch->new($config)->scan('full');
- my $msgs = $srch->reopen->query('m:both@b.com');
+ my $msgs = $ibx->search->reopen->query('m:both@b.com');
my $v1 = $config->lookup_name('v1');
my $msg = $v1->git->cat_file($msgs->[0]->{blob});
is($both, $$msg, 'got original message back from v1');