search: query_approxidate: cleanup regexp, more tests

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

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 8e4cce33f5f6eb267d480da59e3f6b59a9d01fe5..c5a1bd69cdaa7076c8c4445457146717dd16c6a8 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -337,7 +337,7 @@ sub query_argv_to_string {
        my (undef, $git, $argv) = @_;
        my $to_parse;
        my $tmp = join(' ', map {;
-               if (s!\b(d|rt|dt):([[:print:]]+)\z!date_parse_prepare(
+               if (s!\b(d|rt|dt):(\S+)\z!date_parse_prepare(
                                                $to_parse //= [], $1, $2)!sge) {
                        $_;
                } elsif (/\s/) {
@@ -357,7 +357,7 @@ sub query_approxidate {
        my $DQ = qq<"\x{201c}\x{201d}>; # Xapian can use curly quotes
        $_[2] =~ tr/\x00/ /; # Xapian doesn't do NUL, we use it as a placeholder
        my ($terms, $phrase, $to_parse);
-       $_[2] =~ s{([^$DQ]*)([${DQ}][^\"]*[$DQ])?}{
+       $_[2] =~ s{([^$DQ]*)([$DQ][^$DQ]*[$DQ])?}{
                ($terms, $phrase) = ($1, $2);
                $terms =~ s!\b(d|rt|dt):(\S+)!
                        date_parse_prepare($to_parse //= [], $1, $2)!sge;