Bugzilla – Attachment 6670 Details for
Bug 6679
Fixing code so it passes basic Perl::Critic tests
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6697: fix missing use strict
Bug-6697-fix-missing-use-strict.patch (text/plain), 5.89 KB, created by
Paul Poulain
on 2011-12-08 16:14:24 UTC
(
hide
)
Description:
Bug 6697: fix missing use strict
Filename:
MIME Type:
Creator:
Paul Poulain
Created:
2011-12-08 16:14:24 UTC
Size:
5.89 KB
patch
obsolete
>From 4011171b9166a076e7437d4a4c459332f8157ef9 Mon Sep 17 00:00:00 2001 >From: Paul Poulain <paul.poulain@biblibre.com> >Date: Thu, 8 Dec 2011 17:13:38 +0100 >Subject: [PATCH] Bug 6697: 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) > >http://bugs.koha-community.org/show_bug.cgi?id=6679 >--- > 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6679
:
4883
|
4884
|
4885
|
4886
|
4887
|
4888
|
5445
|
5446
|
5483
|
5487
|
6121
|
6122
|
6123
|
6139
|
6140
|
6141
|
6142
|
6143
|
6144
|
6270
|
6271
|
6663
|
6670
|
6675
|
6676
|
6677
|
6678
|
8542
|
8897
|
8898
|
8899
|
8950
|
8951
|
9746
|
9747
|
9748
|
9749
|
9750
|
10050
|
10051
|
10052
|
10053
|
10054
|
10075
|
10076
|
10077
|
10078
|
10079
|
10484
|
10485
|
10486
|
10487
|
10488
|
10489
|
10491
|
10492
|
10493
|
10494
|
10495
|
10496
|
10497
|
10499
|
10500
|
10501
|
10502
|
10503
|
10504
|
10505
|
10506
|
10507
|
10508
|
10509
|
10510
|
10512
|
10513
|
10514
|
10515
|
10517
|
10521
|
10522
|
10523
|
10524
|
10525
|
10526
|
10527
|
10935
|
10936
|
10938
|
10940
|
10944
|
10945
|
10946
|
10947
|
10948
|
10949
|
10950
|
10952
|
10953
|
10955
|
10957
|
10958
|
10959
|
10960
|
10961
|
10962
|
10963
|
10964
|
10965
|
10966
|
10967
|
10972
|
10976
|
10979
|
10980
|
10981
|
12224
|
12363
|
12490
|
12491
|
12492
|
34191
|
34192
|
34193
|
34194
|
34195
|
34196
|
34197
|
39100
|
39101
|
39102
|
39392
|
39393
|
39394
|
39395
|
39396
|
39397
|
39398
|
42770
|
47086
|
47087
|
47088
|
47089
|
47090
|
47178
|
47179
|
47180
|
47181
|
47205
|
47206
|
47207
|
47208