Browse Source

Bug 14960: Remove C4::Dates from files in misc/cronjobs

This patch removes C4::Dates from following files:

- misc/cronjobs/batch_anonymise.pl
- misc/cronjobs/cleanup_database.pl
- misc/cronjobs/gather_print_notices.pl
- misc/cronjobs/serialsUpdate.pl
- misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl
- misc/cronjobs/overdue_notices.pl
- misc/cronjobs/staticfines.pl

To test:
- Carefully review code changes.
- Verify that the cronjobs behave as before.

Amended to make patch apply and follwoing comments on IRC by putti
http://irc.koha-community.org/koha/2015-11-06#i_1752803
(misc/cronjobs/gather_print_notices.pl is using still C4::Dates, line 84)
6.11.2015 /mv

Signed-off-by: Zeno Tajoli <z.tajoli@cineca.it>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
3.22.x
Marc Véron 9 years ago
committed by Tomas Cohen Arazi
parent
commit
ef539cd035
  1. 1
      misc/cronjobs/batch_anonymise.pl
  2. 1
      misc/cronjobs/cleanup_database.pl
  3. 13
      misc/cronjobs/gather_print_notices.pl
  4. 12
      misc/cronjobs/overdue_notices.pl
  5. 4
      misc/cronjobs/serialsUpdate.pl
  6. 15
      misc/cronjobs/staticfines.pl
  7. 6
      misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl

1
misc/cronjobs/batch_anonymise.pl

@ -31,7 +31,6 @@ BEGIN {
use C4::Context;
use C4::Circulation;
use C4::Dates;
use Date::Calc qw(
Today
Add_Delta_Days

1
misc/cronjobs/cleanup_database.pl

@ -35,7 +35,6 @@ BEGIN {
}
use C4::Context;
use C4::Dates;
use C4::Search;
use C4::Search::History;
use Getopt::Long;

13
misc/cronjobs/gather_print_notices.pl

@ -11,7 +11,6 @@ BEGIN {
use CGI qw( utf8 ); # NOT a CGI script, this is just to keep C4::Templates::gettemplate happy
use C4::Context;
use C4::Dates;
use C4::Debug;
use C4::Letters;
use C4::Templates;
@ -82,7 +81,9 @@ $delimiter ||= q|,|;
cronlogaction();
my $today = C4::Dates->new();
my $today_iso = output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' } ) ;
my $today_syspref = output_pref( { dt => dt_from_string, dateonly => 1 } );
my @all_messages = @{ GetPrintMessages() };
# Filter by letter_code
@ -166,8 +167,8 @@ sub print_notices {
while ( my ( $branchcode, $branch_messages ) = each %$messages_by_branch ) {
my $letter_codes = @letter_codes == 0 ? 'all' : join '_', @letter_codes;
my $filename = $split
? "notices_$letter_codes-" . $today->output('iso') . "-$branchcode.$format"
: "notices_$letter_codes-" . $today->output('iso') . ".$format";
? "notices_$letter_codes-" . $today_iso . "-$branchcode.$format"
: "notices_$letter_codes-" . $today_iso . ".$format";
my $filepath = File::Spec->catdir( $output_directory, $filename );
if ( $format eq 'html' ) {
generate_html({
@ -212,7 +213,7 @@ sub generate_html {
$template->param(
stylesheet => C4::Context->preference("NoticeCSS"),
today => $today->output(),
today => $today_syspref,
messages => $messages,
);
@ -310,7 +311,7 @@ sub send_files {
my $mail = MIME::Lite->new(
From => $from,
To => $to,
Subject => 'Print notices for ' . $today->output(),
Subject => 'Print notices for ' . $today_syspref,
Type => 'multipart/mixed',
);

12
misc/cronjobs/overdue_notices.pl

@ -38,7 +38,6 @@ use DateTime;
use DateTime::Duration;
use C4::Context;
use C4::Dates qw/format_date/;
use C4::Debug;
use C4::Letters;
use C4::Overdues qw(GetFine GetOverdueMessageTransportTypes);
@ -527,7 +526,7 @@ END_SQL
my $borrowernumber;
while ( my $data = $sth->fetchrow_hashref ) {
next unless ( DateTime->compare( $date_to_run, dt_from_string($data->{date_due})) ) == 1;
next unless ( DateTime->compare( $date_to_run, dt_from_string($data->{date_due})) ) == 1;
# check the borrower has at least one item that matches
my $days_between;
@ -536,12 +535,12 @@ END_SQL
my $calendar =
Koha::Calendar->new( branchcode => $branchcode );
$days_between =
$calendar->days_between( dt_from_string($data->{date_due}),
$calendar->days_between( dt_from_string($data->{date_due}),
$date_to_run );
}
else {
$days_between =
$date_to_run->delta_days( dt_from_string($data->{date_due}) );
$date_to_run->delta_days( dt_from_string($data->{date_due}) );
}
$days_between = $days_between->in_units('days');
if ($triggered) {
@ -657,7 +656,10 @@ END_SQL
last;
}
$j++;
my @item_info = map { $_ =~ /^date|date$/ ? format_date( $item_info->{$_} ) : $item_info->{$_} || '' } @item_content_fields;
my @item_info = map { $_ =~ /^date|date$/ ?
eval { output_pref( { dt => dt_from_string( $item_info->{$_} ), dateonly => 1 } ); }
:
$item_info->{$_} || '' } @item_content_fields;
$titles .= join("\t", @item_info) . "\n";
$itemcount++;
push @items, $item_info;

4
misc/cronjobs/serialsUpdate.pl

@ -29,10 +29,10 @@ BEGIN {
}
use C4::Context;
use C4::Dates qw/format_date format_date_in_iso/;
use C4::Debug;
use C4::Serials;
use C4::Log;
use Koha::DateUtils;
use Date::Calc qw/Date_to_Days check_date/;
use Getopt::Long;
@ -119,7 +119,7 @@ while ( my $issue = $sth->fetchrow_hashref ) {
if ( $subscription && $publisheddate && $publisheddate ne "0000-00-00" ) {
my $nextpublisheddate = GetNextDate( $subscription, $publisheddate );
my $today = format_date_in_iso( C4::Dates->new()->output() );
my $today = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
if ( $nextpublisheddate && $today ) {
my ( $year, $month, $day ) = split( /-/, $nextpublisheddate );

15
misc/cronjobs/staticfines.pl

@ -103,7 +103,7 @@ foreach (@pcategories) {
}
use vars qw(@borrower_fields @item_fields @other_fields);
use vars qw($fldir $libname $control $mode $delim $dbname $today $today_iso $today_days);
use vars qw($fldir $libname $control $mode $delim $dbname $today_iso $today_days);
use vars qw($filename);
CHECK {
@ -135,8 +135,7 @@ if (defined $borrowernumberlimit) {
}
my $overdueItemsCounted = 0;
my %calendars = ();
$today = C4::Dates->new();
$today_iso = $today->output('iso');
$today_iso = output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' } );
my ($tyear, $tmonth, $tday) = split( /-/, $today_iso );
$today_days = Date_to_Days( $tyear, $tmonth, $tday );
@ -145,14 +144,14 @@ for ( my $i = 0 ; $i < scalar(@$data) ; $i++ ) {
my $datedue;
my $datedue_days;
eval {
$datedue = C4::Dates->new( $data->[$i]->{'date_due'}, 'iso' );
$datedue_days = Date_to_Days( split( /-/, $datedue->output('iso') ) );
$datedue = eval { output_pref( { dt => dt_from_string( $data->[$i]->{'date_due'} ), dateonly => 1, dateformat => 'iso' } ); };
$datedue_days = Date_to_Days( split( /-/, $datedue ) );
};
if ($@) {
warn "Error on date for borrower " . $data->[$i]->{'borrowernumber'} . ": $@date_due: " . $data->[$i]->{'date_due'} . "\ndatedue_days: " . $datedue_days . "\nSkipping";
next;
}
my $due_str = $datedue->output();
my $due_str = eval { output_pref( { dt => dt_from_string( $datedue ), dateonly => 1 } ); };
unless ( defined $data->[$i]->{'borrowernumber'} ) {
print STDERR "ERROR in Getoverdues line $i: issues.borrowernumber IS NULL. Repair 'issues' table now! Skipping record.\n";
next; # Note: this doesn't solve everything. After NULL borrowernumber, multiple issues w/ real borrowernumbers can pile up.
@ -192,8 +191,8 @@ for ( my $i = 0 ; $i < scalar(@$data) ; $i++ ) {
$data->[$i],
$borrower->{'categorycode'},
$branchcode,
dt_from_string($datedue->output('iso')),
dt_from_string($today->output('iso')),
dt_from_string( $datedue ),
dt_from_string( $today_iso ),
);
# Reassign fine's amount if specified in command-line

6
misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl

@ -36,8 +36,8 @@ use C4::Context;
use C4::Items;
use C4::Letters;
use C4::Overdues;
use C4::Dates;
use C4::Calendar;
use Koha::DateUtils;
sub usage {
pod2usage( -verbose => 2 );
@ -124,8 +124,8 @@ foreach my $type (@types) {
}
foreach my $issues (@loop) {
my $date = C4::Dates->new( $issues->{'date_due'}, 'iso' );
my $due_date = $date->output('metric');
my $date_dt = dt_from_string ( $issues->{'date_due'} );
my $due_date = output_pref( { dt => $date_dt, dateonly => 1, dateformat =>'metric' } );
my $letter = C4::Letters::GetPreparedLetter(
module => $module,

Loading…
Cancel
Save