Attachment 6143 Details for Bug 6679 – Bug 6679 : Don't declare variables in conditionals

[patch] Bug 6679 : Don't declare variables in conditionals

Bug-6679--Dont-declare-variables-in-conditionals.patch (text/plain), 3.38 KB, created by Chris Cormack on 2011-11-02 03:24:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2011-11-02 03:24:43 UTC

Size: 3.38 KB

patch

obsolete

>From 9d3fa96529b534b3df5785d232f1b517d0b33c34 Mon Sep 17 00:00:00 2001
>From: Chris Cormack <chrisc@catalyst.net.nz>
>Date: Wed, 2 Nov 2011 16:24:05 +1300
>Subject: [PATCH] Bug 6679 : Don't declare variables in conditionals
>
>---
> cataloguing/value_builder/macles.pl            |   12 ++++++++----
> cataloguing/value_builder/unimarc_field_4XX.pl |   15 +++++++++------
> 2 files changed, 17 insertions(+), 10 deletions(-)
>
>diff --git a/cataloguing/value_builder/macles.pl b/cataloguing/value_builder/macles.pl
>index 2d535c1..76f213b 100755
>--- a/cataloguing/value_builder/macles.pl
>+++ b/cataloguing/value_builder/macles.pl
>@@ -118,20 +118,24 @@ my ($input) = @_;
> #        use Data::Dumper;warn "BIGLOOP IN".Dumper(@BIGLOOP);
>     }
>     foreach my $num (sort keys %numbers){
>-      my @tmpcolhdr = @{$numbers{$num}->{'col_hdr'}} if ($numbers{$num}->{'col_hdr'});
>-      my @tmprowhdr = @{$numbers{$num}->{"row_hdr"}} if ($numbers{$num}->{'row_hdr'});
>+	my @tmpcolhdr;
>+	my @tmprowhdr;
>+        @tmpcolhdr = @{$numbers{$num}->{'col_hdr'}} if ($numbers{$num}->{'col_hdr'});
>+        @tmprowhdr = @{$numbers{$num}->{"row_hdr"}} if ($numbers{$num}->{'row_hdr'});
>       my @lines;
>       my @lists;
>       my %BIGLOOPcell;
>       foreach my $row (@tmprowhdr){
>         my $tmprowvalue=$row->{rowvalue};
>-        my $rowcode=$1 if $tmprowvalue=~/[0-9]([0-9])\./;
>+	  my $rowcode;
>+          $rowcode=$1 if $tmprowvalue=~/[0-9]([0-9])\./;
>         my @cells;
>         if (scalar(@tmpcolhdr)>0){
>         #cas du tableau bidim
>           foreach my $col (@tmpcolhdr){
>             my $tmpcolvalue=$col->{colvalue};
>-            my $colcode=$1 if $tmpcolvalue=~/[0-9]\.([0-9])/;
>+	      my $colcode;
>+              $colcode=$1 if $tmpcolvalue=~/[0-9]\.([0-9])/;
>             my %cell;
>             $cell{celvalue}=$num.$rowcode.$colcode;
>             $cell{rowvalue}=$tmprowvalue;
>diff --git a/cataloguing/value_builder/unimarc_field_4XX.pl b/cataloguing/value_builder/unimarc_field_4XX.pl
>index ddb6547..d3038ef 100755
>--- a/cataloguing/value_builder/unimarc_field_4XX.pl
>+++ b/cataloguing/value_builder/unimarc_field_4XX.pl
>@@ -1,6 +1,6 @@
> #!/usr/bin/perl
> 
>-# Copyright 2000-2002 Katipo Communications
>+# Copyright Biblibre 2007
> #
> # This file is part of Koha.
> #
>@@ -204,12 +204,14 @@ sub plugin {
>         elsif ( $marcrecord->field('200') ) {
>             $subfield_value_a = $marcrecord->subfield( '200', 'f' );
>         }
>-        my $subfield_value_c = $marcrecord->field('210')->subfield("a")
>+	my $subfield_value_c;
>+	my $subfield_value_d;
>+	my $subfield_value_e;
>+        $subfield_value_c = $marcrecord->field('210')->subfield("a")
>           if ( $marcrecord->field('210') );
>-        my $subfield_value_d = $marcrecord->field('210')->subfield("d")
>+        $subfield_value_d = $marcrecord->field('210')->subfield("d")
>           if ( $marcrecord->field('210') );
>-
>-        my $subfield_value_e = $marcrecord->field('205')->subfield("a")
>+	$subfield_value_e = $marcrecord->field('205')->subfield("a")
>           if ( $marcrecord->field('205') );
> 
>         my $subfield_value_h;
>@@ -246,7 +248,8 @@ sub plugin {
>             $subfield_value_i = $marcrecord->field('500')->subfield("i");
>         }
> 
>-        my $subfield_value_p = $marcrecord->field('215')->subfield("a")
>+        my $subfield_value_p;
>+	$subfield_value_p = $marcrecord->field('215')->subfield("a")
>           if ( $marcrecord->field('215') );
> 
>         my $subfield_value_t;
>-- 
>1.7.5.4

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