Bugzilla – Attachment 6144 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 6679 : Tidying changed parts of file
Bug-6679--Tidying-changed-parts-of-file.patch (text/plain), 6.06 KB, created by
Chris Cormack
on 2011-11-02 03:28:31 UTC
(
hide
)
Description:
Bug 6679 : Tidying changed parts of file
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2011-11-02 03:28:31 UTC
Size:
6.06 KB
patch
obsolete
>From 561247961b8a37189a7c3998518e01f7c88b9dee Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Wed, 2 Nov 2011 16:27:48 +1300 >Subject: [PATCH] Bug 6679 : Tidying changed parts of file > >--- > cataloguing/value_builder/macles.pl | 127 ++++++++++++++++++++--------------- > 1 files changed, 72 insertions(+), 55 deletions(-) > >diff --git a/cataloguing/value_builder/macles.pl b/cataloguing/value_builder/macles.pl >index 76f213b..c99508e 100755 >--- a/cataloguing/value_builder/macles.pl >+++ b/cataloguing/value_builder/macles.pl >@@ -117,64 +117,81 @@ my ($input) = @_; > } > # use Data::Dumper;warn "BIGLOOP IN".Dumper(@BIGLOOP); > } >- foreach my $num (sort keys %numbers){ >- 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; >- $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; >- $colcode=$1 if $tmpcolvalue=~/[0-9]\.([0-9])/; >- my %cell; >- $cell{celvalue}=$num.$rowcode.$colcode; >- $cell{rowvalue}=$tmprowvalue; >- $cell{colvalue}=$tmpcolvalue; >- if ($numbers{$num}->{$num.$rowcode.$colcode}){ >- foreach (@{$numbers{$num}->{$num.$rowcode.$colcode}}){ >- push @{$cell{libs}},{'lib'=>$_}; >- } >- }else { >- push @{$cell{libs}},{'lib'=>$num.$rowcode.$colcode}; >+ foreach my $num ( sort keys %numbers ) { >+ 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; >+ $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; >+ $colcode = $1 if $tmpcolvalue =~ /[0-9]\.([0-9])/; >+ my %cell; >+ $cell{celvalue} = $num . $rowcode . $colcode; >+ $cell{rowvalue} = $tmprowvalue; >+ $cell{colvalue} = $tmpcolvalue; >+ if ( $numbers{$num}->{ $num . $rowcode . $colcode } ) { >+ >+ foreach ( >+ @{ $numbers{$num}->{ $num . $rowcode . $colcode } } >+ ) >+ { >+ push @{ $cell{libs} }, { 'lib' => $_ }; >+ } >+ } >+ else { >+ push @{ $cell{libs} }, >+ { 'lib' => $num . $rowcode . $colcode }; >+ } >+ push @cells, \%cell; >+ } >+ if ( $numbers{$num}->{ $num . $rowcode } ) { >+ my @tmpliblist = @{ $numbers{$num}->{ $num . $rowcode } }; >+ push @lists, >+ { 'lib' => $row->{rowlib}, 'liblist' => \@tmpliblist }; >+ } > } >- push @cells,\%cell; >- } >- if ($numbers{$num}->{$num.$rowcode}){ >- my @tmpliblist=@{$numbers{$num}->{$num.$rowcode}}; >- push @lists,{'lib'=>$row->{rowlib},'liblist'=>\@tmpliblist}; >- } >- } else { >- #Cas de la liste simple >- foreach my $key (sort keys %{$numbers{$num}}){ >- my %cell; >- if ($key=~/$num$rowcode[0-9]/){ >- $cell{celvalue}=$key; >- foreach my $lib (@{$numbers{$num}->{$key}}){ >- push @{$cell{'libs'}},{'lib'=>$lib}; >- } >- push @cells,\%cell; >+ else { >+ >+ #Cas de la liste simple >+ foreach my $key ( sort keys %{ $numbers{$num} } ) { >+ my %cell; >+ if ( $key =~ /$num$rowcode[0-9]/ ) { >+ $cell{celvalue} = $key; >+ foreach my $lib ( @{ $numbers{$num}->{$key} } ) { >+ push @{ $cell{'libs'} }, { 'lib' => $lib }; >+ } >+ push @cells, \%cell; >+ } >+ } > } >- } >+ push @lines, >+ { >+ 'cells' => \@cells, >+ 'rowvalue' => $row->{rowvalue}, >+ 'rowlib' => $row->{rowlib} >+ }; > } >- push @lines,{'cells'=>\@cells,'rowvalue'=>$row->{rowvalue},'rowlib'=>$row->{rowlib}}; >- } >- $BIGLOOPcell{'Lists'}=\@lists if (scalar(@lists)>0); >- $BIGLOOPcell{'lines'}=\@lines if (scalar(@lines)>0); >- $BIGLOOPcell{'col_hdr'}=\@tmpcolhdr if (scalar(@tmpcolhdr)>0); >- $BIGLOOPcell{'Table'}=$numbers{$num}->{'Table'}; >- $BIGLOOPcell{'hdr_tab'}=$numbers{$num}->{'hdr_tab'}; >- $BIGLOOPcell{'number'}=$num; >- push @BIGLOOP,\%BIGLOOPcell; >+ $BIGLOOPcell{'Lists'} = \@lists if ( scalar(@lists) > 0 ); >+ $BIGLOOPcell{'lines'} = \@lines if ( scalar(@lines) > 0 ); >+ $BIGLOOPcell{'col_hdr'} = \@tmpcolhdr if ( scalar(@tmpcolhdr) > 0 ); >+ $BIGLOOPcell{'Table'} = $numbers{$num}->{'Table'}; >+ $BIGLOOPcell{'hdr_tab'} = $numbers{$num}->{'hdr_tab'}; >+ $BIGLOOPcell{'number'} = $num; >+ push @BIGLOOP, \%BIGLOOPcell; > } > # warn "BIGLOOP OUT".Dumper(@BIGLOOP); > my ($template, $loggedinuser, $cookie) >-- >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