Bug 25946: borrowerRelationship can be empty

[koha-ffzg.git] / reports / catalogue_stats.pl

diff --git a/reports/catalogue_stats.pl b/reports/catalogue_stats.pl
index c153947..85293b7 100755 (executable)
--- a/reports/catalogue_stats.pl
+++ b/reports/catalogue_stats.pl
@@ -18,19 +18,19 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
 use C4::Auth;
 use CGI qw ( -utf8 );
 use C4::Context;
-use C4::Branch; # GetBranches
 use C4::Output;
 use C4::Koha;
 use C4::Reports;
 use C4::Circulation;
 use C4::Biblio qw/GetMarcSubfieldStructureFromKohaField/;
 
+use Koha::AuthorisedValues;
 use Koha::DateUtils;
+use Koha::ItemTypes;
 
 =head1 NAME
 
@@ -41,7 +41,7 @@ plugin that shows a stats on borrowers
 =cut
 
 our $debug = 0;
-my $input = new CGI;
+my $input = CGI->new;
 my $fullreportname = "reports/catalogue_stats.tt";
 my $do_it       = $input->param('do_it');
 my $line        = $input->param("Line");
@@ -70,7 +70,6 @@ my ($template, $borrowernumber, $cookie)
        = get_template_and_user({template_name => $fullreportname,
                                query => $input,
                                type => "intranet",
-                               authnotrequired => 0,
                                flagsrequired => {reports => '*'},
                                debug => 1,
                                });
@@ -114,25 +113,12 @@ if ($do_it) {
     }
 } else {
        my $dbh = C4::Context->dbh;
-       my @values;
-       my %labels;
        my $count=0;
-       my $req;
-       my @select;
 
-    my $itemtypes = GetItemTypes( style => 'array' );
+    my $itemtypes = Koha::ItemTypes->search_with_localization;
 
-    my $authvals = GetKohaAuthorisedValues("items.ccode");
-    my @authvals;
-    foreach ( sort { $authvals->{$a} cmp $authvals->{$b} || $a cmp $b } keys %$authvals ) {
-        push @authvals, { code => $_, description => $authvals->{$_} };
-    }
-
-    my $locations = GetKohaAuthorisedValues("items.location");
-    my @locations;
-    foreach ( sort keys %$locations ) {
-        push @locations, { code => $_, description => "$_ - " . $locations->{$_} };
-    }
+    my @authvals = map { { code => $_->{authorised_value}, description => $_->{lib} } } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.ccode' }, { order_by => ['description'] } );
+    my @locations = map { { code => $_->{authorised_value}, description => $_->{lib} } } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => 'items.location' }, { order_by => ['description'] } );
 
     foreach my $kohafield (qw(items.notforloan items.materials)) {
         my $subfield_structure = GetMarcSubfieldStructureFromKohaField($kohafield);
@@ -156,7 +142,6 @@ if ($do_it) {
 
     $template->param(
         itemtypes    => $itemtypes,
-        CGIBranch    => GetBranchesLoop( C4::Context->userenv->{'branch'} ),
         locationloop => \@locations,
         authvals     => \@authvals,
         CGIextChoice => \@mime,
@@ -324,7 +309,7 @@ sub calculate {
     } else {
         $sth->execute();
     }
-    my $rowauthvals = GetKohaAuthorisedValues($origline);
+    my $rowauthvals = { map { $_->{authorised_value} => $_->{lib} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => $origline } ) };
     while ( my ($celvalue) = $sth->fetchrow ) {
         my %cell;
         if (defined $celvalue and $celvalue ne '') {
@@ -387,7 +372,7 @@ sub calculate {
     } else {
         $sth2->execute();
     }
-    my $colauthvals = GetKohaAuthorisedValues($origcolumn);
+    my $colauthvals = { map { $_->{authorised_value} => $_->{lib} } Koha::AuthorisedValues->get_descriptions_by_koha_field( { frameworkcode => '', kohafield => $origcolumn } ) };
     while ( my ($celvalue) = $sth2->fetchrow ) {
         my %cell;
         if (defined $celvalue and $celvalue ne '') {
@@ -407,7 +392,6 @@ sub calculate {
     }
 
     my $i = 0;
-    my @totalcol;
     my $hilighted = -1;
 
     #Initialization of cell values.....