X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearch.pm;h=af0a35d9b599f1c991ba4c59b7c926178793d940;hb=fe1b11bf5a752743167018f77e2826304ba0aa0e;hp=7e19e616a2180e28fe7470698b3d555360ee4c93;hpb=4d594e98063aaad1ce9a90709af7edc5c44a0163;p=public-inbox.git

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index 7e19e616..af0a35d9 100644
--- 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