[Patches] [PATCH] Bug 6679: fix missing use strict
koha-patchbot at kohaaloha.com
koha-patchbot at kohaaloha.com
Sat Dec 10 01:05:38 NZDT 2011
From: Paul Poulain <paul.poulain at biblibre.com>
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 <chrisc at catalyst.net.nz>
---
cataloguing/value_builder/stocknumber.pl | 8 +++---
cataloguing/value_builder/unimarc_field_210c.pl | 11 ++++++---
cataloguing/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 4c9b267..711904f 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 = <<END_OF_JS;
if (\$('#' + id).val() == '' || force) {
diff --git a/cataloguing/value_builder/unimarc_field_210c.pl b/cataloguing/value_builder/unimarc_field_210c.pl
index 8ecaeab..e3717ed 100755
--- a/cataloguing/value_builder/unimarc_field_210c.pl
+++ b/cataloguing/value_builder/unimarc_field_210c.pl
@@ -18,8 +18,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::AuthoritiesMarc;
use C4::Auth;
@@ -110,7 +110,10 @@ my ($input) = @_;
my $authtypes = getauthtypes;
my @authtypesloop;
foreach my $thisauthtype (keys %$authtypes) {
- my $selected = 1 if $thisauthtype eq $authtypecode;
+ my $selected;
+ if ($thisauthtype eq $authtypecode) {
+ $selected=1;
+ }
my %row =(value => $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 d3038ef..acc0854 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;
--
1.7.5.4
More information about the Patches
mailing list