search: fix rt: w/ approxidate when TZ != UTC

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

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 59a5a3b006755967699f1731e19039d61574d81d..af0a35d9b599f1c991ba4c59b7c926178793d940 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -187,7 +187,7 @@ sub xdir ($;$) {
        my ($self, $rdonly) = @_;
        if ($rdonly || !defined($self->{shard})) {
                $self->{xpfx};
-       } else { # v2 only:
+       } else { # v2 + extindex only:
                "$self->{xpfx}/$self->{shard}";
        }
 }
@@ -332,7 +332,7 @@ sub date_parse_prepare {
                        push @$to_parse, $x;
                        $x = "\0%s$#$to_parse\0";
                }
-               $r[1] //= "\0%s+\0";
+               $r[1] //= "\0%s+\0"; # add 1 day
        }
        "$pfx:".join('..', @r).$end;
 }
@@ -342,9 +342,12 @@ sub date_parse_finalize {
        # 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. git respects TZ, times stored in SQLite/Xapian are always UTC,
+       # and gmtime doesn't seem to do the right thing when TZ!=UTC
+       my ($i, $t);
+       $_[2] =~ s/\0(%[%YmdHMSs]+)([0-9\+]+)\0/
+               $t = $2 eq '+' ? ($r[$i]+86400) : $r[$i=$2+0];
+               $1 eq '%s' ? $t : strftime($1, gmtime($t))/sge;
 }
 
 # n.b. argv never has NUL, though we'll need to filter it out
@@ -557,19 +560,15 @@ sub get_pct ($) { # mset item
 sub xap_terms ($$;@) {
        my ($pfx, $xdb_or_doc, @docid) = @_; # @docid may be empty ()
        my %ret;
-       eval {
-               my $end = $xdb_or_doc->termlist_end(@docid);
-               my $cur = $xdb_or_doc->termlist_begin(@docid);
-               for (; $cur != $end; $cur++) {
-                       $cur->skip_to($pfx);
-                       last if $cur == $end;
-                       my $tn = $cur->get_termname;
-                       if (index($tn, $pfx) == 0) {
-                               $ret{substr($tn, length($pfx))} = undef;
-                       }
-               }
-       };
-       \%ret;
+       my $end = $xdb_or_doc->termlist_end(@docid);
+       my $cur = $xdb_or_doc->termlist_begin(@docid);
+       for (; $cur != $end; $cur++) {
+               $cur->skip_to($pfx);
+               last if $cur == $end;
+               my $tn = $cur->get_termname;
+               $ret{substr($tn, length($pfx))} = undef if !index($tn, $pfx);
+       }
+       wantarray ? sort(keys(%ret)) : \%ret;
 }
 
 1;