about summary refs log tree commit homepage
diff options
context:
space:
mode:
-rw-r--r--lib/PublicInbox/Search.pm2
-rw-r--r--t/search.t21
2 files changed, 22 insertions, 1 deletions
diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 520aa31d..c5a1bd69 100644
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -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;
diff --git a/t/search.t b/t/search.t
index effba1df..124c9acf 100644
--- a/t/search.t
+++ b/t/search.t
@@ -603,6 +603,27 @@ SKIP: {
         is($qs, qq[f:bob "hello world" d:19931002..20101002],
                 'post-phrase date corrected');
 
+        # Xapian uses "" to escape " inside phrases, we don't explictly
+        # handle that, but are able to pass the result through unchanged
+        for my $pair (["\x{201c}", "\x{201d}"], ['"', '"']) {
+                my ($x, $y) = @$pair;
+                $orig = $qs = qq[${x}hello d:1993-10-02.."" world$y];
+                $s->query_approxidate($g, $qs);
+                is($qs, $orig, 'phrases unchanged \x'.ord($x).'-\x'.ord($y));
+
+                $s->query_approxidate($g, my $tmp = "$qs d:..2010-10-02");
+                is($tmp, "$orig d:..20101002",
+                        'two phrases did not throw off date parsing');
+
+                $orig = $qs = qq[${x}hello d:1993-10-02..$y$x world$y];
+                $s->query_approxidate($g, $qs);
+                is($qs, $orig, 'phrases unchanged \x'.ord($x).'-\x'.ord($y));
+
+                $s->query_approxidate($g, $tmp = "$qs d:..2010-10-02");
+                is($tmp, "$orig d:..20101002",
+                        'two phrases did not throw off date parsing');
+        }
+
         my $x_days_ago = strftime('%Y%m%d', gmtime(time - (5 * 86400)));
         $orig = $qs = qq[broken d:5.days.ago..];
         $s->query_approxidate($g, $qs);