Bug 15258: Fix Perl scripts declaring unused variables

[koha.git] / catalogue / MARCdetail.pl

diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl
index 5eb50e5..0aff184 100755 (executable)
--- a/catalogue/MARCdetail.pl
+++ b/catalogue/MARCdetail.pl
@@ -5,18 +5,18 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 =head1 NAME
 
@@ -49,7 +49,7 @@ use strict;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Koha;
 use MARC::Record;
 use C4::Biblio;
@@ -59,6 +59,7 @@ use C4::Members; # to use GetMember
 use C4::Serials;    #uses getsubscriptionsfrombiblionumber GetSubscriptionsFromBiblionumber
 use C4::Search;                # enabled_staff_search_views
 
+use List::MoreUtils qw( uniq );
 
 my $query        = new CGI;
 my $dbh          = C4::Context->dbh;
@@ -129,7 +130,6 @@ foreach my $thisframeworkcode ( keys %$frameworks ) {
 $template->param( frameworkcodeloop => \@frameworkcodeloop, );
 # fill arrays
 my @loop_data = ();
-my $tag;
 
 # loop through each tab 0 through 9
 for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
@@ -259,55 +259,39 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
 my @fields = $record->fields();
 my %witness
   ; #---- stores the list of subfields used at least once, with the "meaning" of the code
-my @big_array;
+my @item_subfield_codes;
+my @item_loop;
 my $norequests = 1;
 foreach my $field (@fields) {
     next if ( $field->tag() < 10 );
     my @subf = $field->subfields;
-    my %this_row;
+    my $item;
 
     # loop through each subfield
     for my $i ( 0 .. $#subf ) {
         next if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{tab} ne 10 );
         next if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{hidden} =~ /-7|-4|-3|-2|2|3|5|8/);
+        push @item_subfield_codes, $subf[$i][0];
         $witness{ $subf[$i][0] } =
         $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{lib};
-        $this_row{ $subf[$i][0] } = GetAuthorisedValueDesc( $field->tag(),
+        $item->{ $subf[$i][0] } = GetAuthorisedValueDesc( $field->tag(),
                         $subf[$i][0], $subf[$i][1], '', $tagslib) || $subf[$i][1];
         $norequests = 0 if $subf[$i][1] ==0 and $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{kohafield} eq 'items.notforloan';
     }
-    if (%this_row) {
-        push( @big_array, \%this_row );
-    }
+    push @item_loop, $item if $item;
 }
 
 my ($holdingbrtagf,$holdingbrtagsubf) = &GetMarcFromKohaField("items.holdingbranch",$frameworkcode);
-@big_array = sort {$a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf}} @big_array;
-
-#fill big_row with missing datas
-foreach my $subfield_code ( keys(%witness) ) {
-    for ( my $i = 0 ; $i <= $#big_array ; $i++ ) {
-        $big_array[$i]{$subfield_code} = "&nbsp;"
-          unless ( $big_array[$i]{$subfield_code} );
-    }
-}
-
-# now, construct template !
-my @item_value_loop;
-my @header_value_loop;
-for ( my $i = 0 ; $i <= $#big_array ; $i++ ) {
-    my $items_data;
-    foreach my $subfield_code ( keys(%witness) ) {
-        $items_data .= "<td>" . $big_array[$i]{$subfield_code} . "</td>";
+@item_loop = sort {$a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf}} @item_loop;
+
+@item_subfield_codes = uniq @item_subfield_codes;
+# fill item info
+my @item_header_loop;
+for my $subfield_code ( @item_subfield_codes ) {
+    push @item_header_loop, $witness{$subfield_code};
+    for my $item_data ( @item_loop ) {
+        $item_data->{$subfield_code} ||= "&nbsp;"
     }
-    my %row_data;
-    $row_data{item_value} = $items_data;
-    push( @item_value_loop, \%row_data );
-}
-foreach my $subfield_code ( keys(%witness) ) {
-    my %header_value;
-    $header_value{header_value} = $witness{$subfield_code};
-    push( @header_value_loop, \%header_value );
 }
 
 my $subscriptionscount = CountSubscriptionFromBiblionumber($biblionumber);
@@ -322,9 +306,10 @@ if ($subscriptionscount) {
 }
 
 $template->param (
-    norequests              => $norequests, 
-    item_loop               => \@item_value_loop,
-    item_header_loop        => \@header_value_loop,
+    norequests              => $norequests,
+    item_loop               => \@item_loop,
+    item_header_loop        => \@item_header_loop,
+    item_subfield_codes     => \@item_subfield_codes,
     biblionumber            => $biblionumber,
     popup                   => $popup,
     hide_marc               => C4::Context->preference('hide_marc'),