lei q: use git approxidate with d:, dt: and rt: ranges

[public-inbox.git] / lib / PublicInbox / LeiQuery.pm

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 0346498fa4f50851f225a84fbe357233d2d1b3c5..d637b1ae76138974cc7cf8c47b38dcbaa3058abc 100644 (file)
--- 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) {
@@ -81,7 +82,7 @@ sub lei_q {
        $self->{l2m}->{jobs} = ($mj // $nproc) if $self->{l2m};
        PublicInbox::LeiOverview->new($self) or return;
 
-       my %mset_opt = map { $_ => $opt->{$_} } qw(thread limit offset);
+       my %mset_opt = map { $_ => $opt->{$_} } qw(threads limit offset);
        $mset_opt{asc} = $opt->{'reverse'} ? 1 : 0;
        $mset_opt{limit} //= 10000;
        if (defined(my $sort = $opt->{'sort'})) {
@@ -96,7 +97,7 @@ sub lei_q {
                }
        }
        # descending docid order
-       $mset_opt{relevance} //= -2 if $opt->{thread};
+       $mset_opt{relevance} //= -2 if $opt->{threads};
        $self->{mset_opt} = \%mset_opt;
 
        if ($opt->{stdin}) {
@@ -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);
 }