search: expand "d:" to "dt:" for precision with approxidate

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

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index c7d52dafc3f4f9e37491aea50c6ac13880ee8b62..fbcff2c38fff410ab81f399901e14af3b55841c4 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -275,7 +275,9 @@ sub date_parse_prepare {
 
        # expand "d:20101002" => "d:20101002..20101003" and like
        # n.b. git doesn't do YYYYMMDD w/o '-', it needs YYYY-MM-DD
+       # We upgrade "d:" to "dt:" to iff using approxidate
        if ($pfx eq 'd') {
+               my $fmt = "\0%Y%m%d";
                if (!defined($r[1])) {
                        if ($r[0] =~ /\A([0-9]{4})([0-9]{2})([0-9]{2})\z/) {
                                push @$to_parse, "$1-$2-$3";
@@ -283,14 +285,27 @@ sub date_parse_prepare {
                                # to parse anyways for "d+" below
                        } else {
                                push @$to_parse, $r[0];
+                               if ($r[0] !~ /\A[0-9]{4}-[0-9]{2}-[0-9]{2}\z/) {
+                                       $pfx = 'dt';
+                                       $fmt = "\0%Y%m%d%H%M%S";
+                               }
                        }
-                       $r[0] = "\0%Y%m%d$#$to_parse\0";
-                       $r[1] = "\0%Y%m%d+\0";
+                       $r[0] = "$fmt+$#$to_parse\0";
+                       $r[1] = "$fmt+\0";
                } else {
                        for my $x (@r) {
                                next if $x eq '' || $x =~ /\A[0-9]{8}\z/;
                                push @$to_parse, $x;
-                               $x = "\0%Y%m%d$#$to_parse\0";
+                               if ($x !~ /\A[0-9]{4}-[0-9]{2}-[0-9]{2}\z/) {
+                                       $pfx = 'dt';
+                               }
+                               $x = "$fmt$#$to_parse\0";
+                       }
+                       if ($pfx eq 'dt') {
+                               for (@r) {
+                                       s/\0%Y%m%d/\0%Y%m%d%H%M%S/;
+                                       s/\A([0-9]{8})\z/${1}000000/;
+                               }
                        }
                }
        } elsif ($pfx eq 'dt') {
@@ -370,7 +385,7 @@ sub query_approxidate {
 sub mset {
        my ($self, $query_string, $opts) = @_;
        $opts ||= {};
-       my $qp = $self->{qp} //= qparse_new($self);
+       my $qp = $self->{qp} //= $self->qparse_new;
        my $query = $qp->parse_query($query_string, $self->{qp_flags});
        _do_enquire($self, $query, $opts);
 }
@@ -463,7 +478,7 @@ sub mset_to_smsg {
 sub stemmer { $X{Stem}->new($LANG) }
 
 # read-only
-sub qparse_new ($) {
+sub qparse_new {
        my ($self) = @_;
 
        my $xdb = xdb($self);
@@ -516,7 +531,7 @@ EOF
 
 sub help {
        my ($self) = @_;
-       $self->{qp} //= qparse_new($self); # parse altids
+       $self->{qp} //= $self->qparse_new; # parse altids
        my @ret = @HELP;
        if (my $user_pfx = $self->{-user_pfx}) {
                push @ret, @$user_pfx;