From 9c251e8f002f06bf367e1846e45480ae24b24af5 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Mon, 27 Apr 2015 18:03:55 -0400 Subject: [PATCH] [Signed-off] Bug 14066: Correct and optimize MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As far as I can tell $sunday is never used. And it seemed to be scoped to only _init. The remaining hashiness was cleaned up for the $return_by_hour. TEST PLAN --------- 1) Apply both patches 2) (Skip this one - file does not exist / MV) prove -v t/db_dependent/Calendar.t 3) prove -v t/db_dependent/Holidays.t 4) prove -v t/Calendar.t 5) perlcritic -3 Koha/Calendar.pm -- the message corresponds to a comment in the code already and not this change. 6) run koha qa test tools Signed-off-by: Mark Tompsett Signed-off-by: Marc Véron --- Koha/Calendar.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Koha/Calendar.pm b/Koha/Calendar.pm index 451c6a3..27a02b5 100644 --- a/Koha/Calendar.pm +++ b/Koha/Calendar.pm @@ -33,7 +33,6 @@ sub _init { ); $weekly_closed_days_sth->execute( $branch ); $self->{weekly_closed_days} = [ 0, 0, 0, 0, 0, 0, 0 ]; - my $sunday => 7; while ( my $tuple = $weekly_closed_days_sth->fetchrow_hashref ) { $self->{weekly_closed_days}->[ $tuple->{weekday} ] = 1; } @@ -126,7 +125,7 @@ sub addDate { if ( $unit eq 'hours' ) { # Fixed for legacy support. Should be set as a branch parameter - my $return_by_hour => 10; + my $return_by_hour = 10; $dt = $self->addHours($startdate, $add_duration, $return_by_hour); } else { @@ -221,7 +220,8 @@ sub is_holiday { my $dow = $localdt->day_of_week; # Representation fix - # TODO: Shouldn't we shift the rest of the $dow also? + # DateTime object dow (1-7) where Monday is 1 + # Arrays are 0-based where 0 = Sunday, not 7. if ( $dow == 7 ) { $dow = 0; } -- 1.7.10.4