aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael J Tosh <michael.j.tosh@lmco.com>2011-04-05 19:19:24 -0700
committerMax Kanat-Alexander <mkanat@bugzilla.org>2011-04-05 19:19:24 -0700
commitc949aab1aec88506a87f3eedc78308b1ad7f0c89 (patch)
tree7217a92eeb6441ce24e763a1f88dacf3e9994a49
parent9dc6cbf7cf3cea757670c9bed819652f356d1798 (diff)
downloadbugs-c949aab1aec88506a87f3eedc78308b1ad7f0c89.tar
bugs-c949aab1aec88506a87f3eedc78308b1ad7f0c89.tar.gz
bugs-c949aab1aec88506a87f3eedc78308b1ad7f0c89.tar.bz2
bugs-c949aab1aec88506a87f3eedc78308b1ad7f0c89.tar.xz
bugs-c949aab1aec88506a87f3eedc78308b1ad7f0c89.zip
Bug 313726: When searching by relative dates, don't make them go to the
"beginning" of the specified period unless the user explicitly requests that. r=mkanat, a=mkanat
-rw-r--r--Bugzilla/Search.pm48
1 files changed, 33 insertions, 15 deletions
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index fddb18194..4b0260137 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -1880,40 +1880,58 @@ sub _timestamp_translate {
sub SqlifyDate {
my ($str) = @_;
+ my $fmt = "%Y-%m-%d %H:%M:%S";
$str = "" if !defined $str;
if ($str eq "") {
my ($sec, $min, $hour, $mday, $month, $year, $wday) = localtime(time());
return sprintf("%4d-%02d-%02d 00:00:00", $year+1900, $month+1, $mday);
}
- if ($str =~ /^(-|\+)?(\d+)([hHdDwWmMyY])$/) { # relative date
- my ($sign, $amount, $unit, $date) = ($1, $2, lc $3, time);
+ if ($str =~ /^(-|\+)?(\d+)([hdwmy])(s?)$/i) { # relative date
+ my ($sign, $amount, $unit, $startof, $date) = ($1, $2, lc $3, lc $4, time);
my ($sec, $min, $hour, $mday, $month, $year, $wday) = localtime($date);
if ($sign && $sign eq '+') { $amount = -$amount; }
+ $startof = 1 if $amount == 0;
if ($unit eq 'w') { # convert weeks to days
- $amount = 7*$amount + $wday;
+ $amount = 7*$amount;
+ $amount += $wday if $startof;
$unit = 'd';
}
if ($unit eq 'd') {
- $date -= $sec + 60*$min + 3600*$hour + 24*3600*$amount;
- return time2str("%Y-%m-%d %H:%M:%S", $date);
+ if ($startof) {
+ $fmt = "%Y-%m-%d 00:00:00";
+ $date -= $sec + 60*$min + 3600*$hour;
+ }
+ $date -= 24*3600*$amount;
+ return time2str($fmt, $date);
}
elsif ($unit eq 'y') {
- return sprintf("%4d-01-01 00:00:00", $year+1900-$amount);
+ if ($startof) {
+ return sprintf("%4d-01-01 00:00:00", $year+1900-$amount);
+ }
+ else {
+ return sprintf("%4d-%02d-%02d %02d:%02d:%02d",
+ $year+1900-$amount, $month+1, $mday, $hour, $min, $sec);
+ }
}
elsif ($unit eq 'm') {
$month -= $amount;
while ($month<0) { $year--; $month += 12; }
- return sprintf("%4d-%02d-01 00:00:00", $year+1900, $month+1);
+ if ($startof) {
+ return sprintf("%4d-%02d-01 00:00:00", $year+1900, $month+1);
+ }
+ else {
+ return sprintf("%4d-%02d-%02d %02d:%02d:%02d",
+ $year+1900, $month+1, $mday, $hour, $min, $sec);
+ }
}
elsif ($unit eq 'h') {
- # Special case 0h for 'beginning of this hour'
- if ($amount == 0) {
- $date -= $sec + 60*$min;
- } else {
- $date -= 3600*$amount;
- }
- return time2str("%Y-%m-%d %H:%M:%S", $date);
+ # Special case for 'beginning of an hour'
+ if ($startof) {
+ $fmt = "%Y-%m-%d %H:00:00";
+ }
+ $date -= 3600*$amount;
+ return time2str($fmt, $date);
}
return undef; # should not happen due to regexp at top
}
@@ -1921,7 +1939,7 @@ sub SqlifyDate {
if (!defined($date)) {
ThrowUserError("illegal_date", { date => $str });
}
- return time2str("%Y-%m-%d %H:%M:%S", $date);
+ return time2str($fmt, $date);
}
######################################