diff options
author | Eric Wong <e@80x24.org> | 2021-02-07 23:05:19 -1000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-02-08 22:07:49 +0000 |
commit | fbb7ccabbf54a4054e583dfabc4d0c4cbe2844cb (patch) | |
tree | a10b48170b6828d8e57ddcc9e5bcb08a4ced98eb /lib/PublicInbox/LeiQuery.pm | |
parent | 9e9ab7447b219bad3f764dfc646d8d7e9d7c39f4 (diff) | |
download | public-inbox-fbb7ccabbf54a4054e583dfabc4d0c4cbe2844cb.tar.gz |
Instead of having --(sent|received)-(before|after)=s command-line switches, we'll just try to make sense of argv so it's usable within parenthesized statements and such. Given the negligible performance penalty with Inline::C process spawning, we'll probably wire this up to the WWW interface, too. "d:" is for mairix compatibility. I don't know if "dt:" and "rt:" will be too useful, but they exist because of IMAP (and JMAP).
Diffstat (limited to 'lib/PublicInbox/LeiQuery.pm')
-rw-r--r-- | lib/PublicInbox/LeiQuery.pm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm index 9a6fa718..d637b1ae 100644 --- a/lib/PublicInbox/LeiQuery.pm +++ b/lib/PublicInbox/LeiQuery.pm @@ -34,9 +34,10 @@ sub lei_q { my @only = @{$opt->{only} // []}; # --local is enabled by default unless --only is used # we'll allow "--only $LOCATION --local" + my $sto = $self->_lei_store(1); + my $lse = $sto->search; if ($opt->{'local'} //= scalar(@only) ? 0 : 1) { - my $sto = $self->_lei_store(1); - $lxs->prepare_external($sto->search); + $lxs->prepare_external($lse); } if (@only) { for my $loc (@only) { @@ -107,12 +108,7 @@ no query allowed on command-line with --stdin PublicInbox::InputPipe::consume($self->{0}, \&qstr_add, $self); return; } - # Consider spaces in argv to be for phrase search in Xapian. - # In other words, the users should need only care about - # normal shell quotes and not have to learn Xapian quoting. - $mset_opt{qstr} = join(' ', map {; - /\s/ ? (s/\A(\w+:)// ? qq{$1"$_"} : qq{"$_"}) : $_ - } @argv); + $mset_opt{qstr} = $lse->query_argv_to_string($lse->git, \@argv); $lxs->do_query($self); } |