search: use "z:" instead of "bytes:" prefix

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

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index b3fd532d80db1461b6604a60e08dfe9deeeeb04e..209969c57c94b6a1d515d60c33e08a079da4f6f5 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -321,13 +321,23 @@ sub date_parse_prepare {
        "$pfx:".join('..', @r).$end;
 }
 
+sub date_parse_finalize {
+       my ($git, $to_parse) = @_;
+       # git-rev-parse can handle any number of args up to system
+       # limits (around (4096*32) bytes on Linux).
+       my @r = $git->date_parse(@$to_parse);
+       my $i;
+       $_[2] =~ s/\0(%[%YmdHMSs]+)([0-9\+]+)\0/strftime($1,
+               gmtime($2 eq '+' ? ($r[$i]+86400) : $r[$i=$2+0]))/sge;
+}
+
 # n.b. argv never has NUL, though we'll need to filter it out
 # if this $argv isn't from a command execution
 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/) {
@@ -336,17 +346,26 @@ sub query_argv_to_string {
                        $_
                }
        } @$argv);
-       # git-rev-parse can handle any number of args up to system
-       # limits (around (4096*32) bytes on Linux).
-       if ($to_parse) {
-               my @r = $git->date_parse(@$to_parse);
-               my $i;
-               $tmp =~ s/\0(%[%YmdHMSs]+)([0-9\+]+)\0/strftime($1,
-                       gmtime($2 eq '+' ? ($r[$i]+86400) : $r[$i=$2+0]))/sge;
-       }
+       date_parse_finalize($git, $to_parse, $tmp) if $to_parse;
        $tmp
 }
 
+# this is for the WWW "q=" query parameter and "lei q --stdin"
+# it can't do d:"5 days ago", but it will do d:5.days.ago
+sub query_approxidate {
+       my (undef, $git) = @_; # $_[2] = $query_string (modified in-place)
+       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]*[$DQ])?}{
+               ($terms, $phrase) = ($1, $2);
+               $terms =~ s!\b(d|rt|dt):(\S+)!
+                       date_parse_prepare($to_parse //= [], $1, $2)!sge;
+               $terms.($phrase // '');
+               }sge;
+       date_parse_finalize($git, $to_parse, $_[2]) if $to_parse;
+}
+
 # read-only
 sub mset {
        my ($self, $query_string, $opts) = @_;
@@ -462,7 +481,7 @@ sub qparse_new ($) {
        $cb->($qp, $NVRP->new(DT, 'dt:'));
 
        # for IMAP, undocumented for WWW and may be split off go away
-       $cb->($qp, $NVRP->new(BYTES, 'bytes:'));
+       $cb->($qp, $NVRP->new(BYTES, 'z:'));
        $cb->($qp, $NVRP->new(TS, 'rt:'));
        $cb->($qp, $NVRP->new(UID, 'uid:'));