Bug 37775: Spelling and tidy

Signed-off-by: Brendan Lawlor <blawlor@clamsnet.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Nick Clemens 2024-08-30 12:51:37 +00:00 committed by Martin Renvoize
parent dba9dd4053
commit d785fb1c1e
Signed by: martin.renvoize
GPG key ID: 422B469130441A0F

View file

@ -21,17 +21,17 @@ use strict;
use warnings; use warnings;
use Getopt::Long qw( GetOptions ); use Getopt::Long qw( GetOptions );
use Pod::Usage qw( pod2usage ); use Pod::Usage qw( pod2usage );
use Koha::Script -cron; use Koha::Script -cron;
use Koha::DateUtils qw( dt_from_string ); use Koha::DateUtils qw( dt_from_string );
use C4::Context; use C4::Context;
use C4::Biblio qw( UpdateTotalIssues ); use C4::Biblio qw( UpdateTotalIssues );
use C4::Log qw( cronlogaction ); use C4::Log qw( cronlogaction );
use DateTime; use DateTime;
use DateTime::Format::MySQL; use DateTime::Format::MySQL;
use Time::HiRes qw( time ); use Time::HiRes qw( time );
use POSIX qw( ceil strftime ); use POSIX qw( ceil strftime );
sub usage { sub usage {
pod2usage( -verbose => 2 ); pod2usage( -verbose => 2 );
@ -49,10 +49,10 @@ my $interval;
my $usestats = 0; my $usestats = 0;
my $useitems = 0; my $useitems = 0;
my $incremental = 0; my $incremental = 0;
my $progress = 100; my $progress = 100;
my $unit; my $unit;
my $command_line_options = join(" ",@ARGV); my $command_line_options = join( " ", @ARGV );
my $result = GetOptions( my $result = GetOptions(
'v|verbose' => \$verbose, 'v|verbose' => \$verbose,
@ -62,7 +62,7 @@ my $result = GetOptions(
'use-stats' => \$usestats, 'use-stats' => \$usestats,
'use-items' => \$useitems, 'use-items' => \$useitems,
'incremental' => \$incremental, 'incremental' => \$incremental,
'p|progress=i' => \$progress, 'p|progress=i' => \$progress,
'h|help' => \$want_help 'h|help' => \$want_help
); );
@ -74,8 +74,7 @@ if ( defined $since && defined $interval ) {
} }
if ( $useitems && $incremental ) { if ( $useitems && $incremental ) {
print print "The --use-items and --incremental options are mutually exclusive.\n\n";
"The --use-items and --incremental options are mutually exclusive.\n\n";
$want_help = 1; $want_help = 1;
} }
@ -90,7 +89,7 @@ unless ( $usestats || $useitems ) {
usage() if $want_help; usage() if $want_help;
cronlogaction({ info => $command_line_options }); cronlogaction( { info => $command_line_options } );
my $dbh = C4::Context->dbh; my $dbh = C4::Context->dbh;
@ -105,13 +104,12 @@ process_stats() if $usestats;
report(); report();
cronlogaction({ action => 'End', info => "COMPLETED" }); cronlogaction( { action => 'End', info => "COMPLETED" } );
exit 0; exit 0;
sub process_items { sub process_items {
my $query = my $query = "SELECT items.biblionumber, SUM(items.issues) FROM items GROUP BY items.biblionumber;";
"SELECT items.biblionumber, SUM(items.issues) FROM items GROUP BY items.biblionumber;";
process_query($query); process_query($query);
} }
@ -128,15 +126,13 @@ sub process_stats {
); );
$interval =~ m/([0-9]*)([hdwmy]?)$/; $interval =~ m/([0-9]*)([hdwmy]?)$/;
$unit = $2 || 'd'; $unit = $2 || 'd';
$since = DateTime::Format::MySQL->format_datetime( $since = DateTime::Format::MySQL->format_datetime( $dt->subtract( $units{$unit} => $1 ) );
$dt->subtract( $units{$unit} => $1 ) );
} }
my $limit = ''; my $limit = '';
$limit = " WHERE statistics.datetime >= ?" if ( $interval || $since ); $limit = " WHERE statistics.datetime >= ?" if ( $interval || $since );
my $query = my $query = "SELECT biblio.biblionumber, COUNT(statistics.itemnumber) FROM biblio\
"SELECT biblio.biblionumber, COUNT(statistics.itemnumber) FROM biblio\
LEFT JOIN items ON (biblio.biblionumber=items.biblionumber)\ LEFT JOIN items ON (biblio.biblionumber=items.biblionumber)\
LEFT JOIN statistics ON (items.itemnumber=statistics.itemnumber AND statistics.type = 'issue') LEFT JOIN statistics ON (items.itemnumber=statistics.itemnumber AND statistics.type = 'issue')
$limit\ $limit\
@ -152,8 +148,7 @@ sub process_query {
if ( $since && $uselimit ) { if ( $since && $uselimit ) {
$sth->execute($since); $sth->execute($since);
} } else {
else {
$sth->execute(); $sth->execute();
} }
@ -161,7 +156,7 @@ sub process_query {
$num_bibs_processed++; $num_bibs_processed++;
$totalissues = 0 unless $totalissues; $totalissues = 0 unless $totalissues;
print "Processing bib $biblionumber ($totalissues issues)\n" print "Processing bib $biblionumber ($totalissues issues)\n"
if $verbose; if $verbose;
if ( not $test_only ) { if ( not $test_only ) {
my $ret; my $ret;
if ( $incremental && $totalissues > 0 ) { if ( $incremental && $totalissues > 0 ) {
@ -184,7 +179,7 @@ sub process_query {
} }
sub report { sub report {
my $endtime = time(); my $endtime = time();
my $totaltime = ceil( ( $endtime - $starttime ) * 1000 ); my $totaltime = ceil( ( $endtime - $starttime ) * 1000 );
$starttime = strftime( '%D %T', localtime($starttime) ); $starttime = strftime( '%D %T', localtime($starttime) );
$endtime = strftime( '%D %T', localtime($endtime) ); $endtime = strftime( '%D %T', localtime($endtime) );
@ -269,7 +264,7 @@ processing the last twenty-four hours.
=item B<--progress=N> =item B<--progress=N>
Print the progress to standart output after every N records are processed. Print the progress to standard output after every N records are processed.
=item B<--test> =item B<--test>