From 0bbf91bf33104cf89cbda99c5e332e68084be6f4 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 8 Feb 2022 14:45:11 -0300 Subject: [PATCH] Bug 30042: Remove Date::Calc dependency in batch_anonymize.pl MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch makes the script use the Koha::DateUtils tools instead. To test: 1. Run: $ kshell k$ perl misc/cronjobs/batch_anonymise.pl --verbose --days 7 => SUCCESS: You see (the date may vary): Checkouts and holds before 2022-02-15 will be anonymised. 2. Apply this patch 3. Repeat 1 => SUCCESS: Same output 4. Sign off :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Joonas Kylmälä Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi (cherry picked from commit caebb20cbb9f456750390d6494c568536dc1066c) Signed-off-by: Lucas Gass --- misc/cronjobs/batch_anonymise.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/misc/cronjobs/batch_anonymise.pl b/misc/cronjobs/batch_anonymise.pl index 786e847c34..24edb727f4 100755 --- a/misc/cronjobs/batch_anonymise.pl +++ b/misc/cronjobs/batch_anonymise.pl @@ -25,10 +25,10 @@ use C4::Context; use C4::Log qw( cronlogaction ); use Koha::Database; +use Koha::DateUtils qw(dt_from_string output_pref); use Koha::Old::Checkouts; use Koha::Old::Holds; -use Date::Calc qw( Add_Delta_Days Today ); use Getopt::Long qw( GetOptions ); sub usage { @@ -62,10 +62,10 @@ if ( !$days ) { cronlogaction(); -my ($year,$month,$day) = Today(); -my ($newyear,$newmonth,$newday) = Add_Delta_Days ($year,$month,$day,(-1)*$days); -my $formatdate = sprintf "%4d-%02d-%02d",$newyear,$newmonth,$newday; -$verbose and print "Checkouts and holds before $formatdate will be anonymised.\n"; +my $date = dt_from_string->subtract( days => $days ); + +print "Checkouts and holds before " . output_pref( { dt => $date, dateformat => 'iso', dateonly => 1 } ) . " will be anonymised.\n" + if $verbose; my $rows = Koha::Old::Checkouts ->filter_by_anonymizable -- 2.39.5