From fe50ffb37f912e32b2f0291a11dd6139120f2ba0 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Thu, 8 Dec 2011 17:13:38 +0100 Subject: [PATCH] Bug 6679: fix missing use strict The 3 files had use strict missing. The patch add the use strict and modify what's needed to work with it 4XX.pl also has some perlcritic fixes: Variable declared in conditional statement at line XXX, column 9. Declare variables outside of the condition. (Severity: 5) Signed-off-by: Chris Cormack --- cataloguing/value_builder/stocknumber.pl | 8 +++--- .../value_builder/unimarc_field_210c.pl | 11 +++++--- .../value_builder/unimarc_field_4XX.pl | 26 ++++++++++++------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/cataloguing/value_builder/stocknumber.pl b/cataloguing/value_builder/stocknumber.pl index 4c9b2671c1..711904fd5f 100755 --- a/cataloguing/value_builder/stocknumber.pl +++ b/cataloguing/value_builder/stocknumber.pl @@ -17,8 +17,8 @@ # with Koha; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -#use strict; -#use warnings; FIXME - Bug 2505 +use strict; +use warnings; use C4::Context; =head1 plugin_parameters @@ -53,12 +53,12 @@ sub plugin_javascript { my $branchcode = C4::Context->userenv->{'branch'}; - $query = "SELECT MAX(CAST(SUBSTRING_INDEX(stocknumber,'_',-1) AS SIGNED))+1 FROM items WHERE homebranch = ? AND stocknumber LIKE ?"; + my $query = "SELECT MAX(CAST(SUBSTRING_INDEX(stocknumber,'_',-1) AS SIGNED))+1 FROM items WHERE homebranch = ? AND stocknumber LIKE ?"; my $sth=$dbh->prepare($query); $sth->execute($branchcode,$branchcode."_%"); my ($nextnum) = $sth->fetchrow; - my $nextnum = $branchcode.'_'.$nextnum; + $nextnum = $branchcode.'_'.$nextnum; my $scr = < $thisauthtype, selected => $selected, authtypetext => $authtypes->{$thisauthtype}{'authtypetext'}, @@ -183,7 +186,7 @@ my ($input) = @_; } else { $to = (($startfrom+1)*$resultsperpage); } - my $link="../cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&authtypecode=EDITORS&and_or=$and_or&marclist=$marclist&operator=$operator&orderby=$orderby&excluding=$excluding&".join("&",map {"value=".$_} @value)."&op=do_search&type=intranet&index=$index"; + my $link="../cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&authtypecode=EDITORS&".join("&",map {"value=".$_} @value)."&op=do_search&type=intranet&index=$index"; $template->param(result => $results) if $results; $template->param('index' => $query->param('index')); diff --git a/cataloguing/value_builder/unimarc_field_4XX.pl b/cataloguing/value_builder/unimarc_field_4XX.pl index d3038ef395..acc085474b 100755 --- a/cataloguing/value_builder/unimarc_field_4XX.pl +++ b/cataloguing/value_builder/unimarc_field_4XX.pl @@ -269,8 +269,10 @@ sub plugin { $subfield_value_t = $marcrecord->field('500')->subfield("a"); } - my $subfield_value_u = $marcrecord->field('856')->subfield("u") - if ( $marcrecord->field('856') ); + my $subfield_value_u; + if ( $marcrecord->field('856') ) { + $subfield_value_u = $marcrecord->field('856')->subfield("u"); + } my $subfield_value_v; if ( ( $marcrecord->field('225') ) @@ -283,14 +285,17 @@ sub plugin { { $subfield_value_v = $marcrecord->field('200')->subfield("h"); } - my $subfield_value_x = $marcrecord->field('011')->subfield("a") - if ( + my $subfield_value_x; + if ( $marcrecord->field('011') and not( ( $marcrecord->field('011')->subfield("y") ) - or ( $marcrecord->field('011')->subfield("z") ) ) - ); - my $subfield_value_y = $marcrecord->field('013')->subfield("a") - if ( $marcrecord->field('013') ); + or ( $marcrecord->field('011')->subfield("z") ) ) ) { + $subfield_value_x = $marcrecord->field('011')->subfield("a"); + } + my $subfield_value_y; + if ( $marcrecord->field('013') ) { + $subfield_value_y = $marcrecord->field('013')->subfield("a"); + } if ( $marcrecord->field('010') ) { $subfield_value_y = $marcrecord->field('010')->subfield("a"); } @@ -374,7 +379,10 @@ sub plugin { my $record = MARC::Record::new_from_usmarc( $results->[$i] ); my $rechash = TransformMarcToKoha( $dbh, $record ); my $pos; - my $countitems = 1 if ( $rechash->{itemnumber} ); + my $countitems; + if ( $rechash->{itemnumber} ) { + $countitems=1; + } while ( index( $rechash->{itemnumber}, '|', $pos ) > 0 ) { $countitems += 1; $pos = index( $rechash->{itemnumber}, '|', $pos ) + 1; -- 2.39.5