From 65895285d9c47e7fab13b0f67d0d0f7409c0673d Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Tue, 12 Jan 2016 16:49:15 +0100 Subject: [PATCH] Bug 15572: TransformHtmlToMarc - rewrite the loop MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This rewrites the while loop into a for loop, so $i still gets incremented when we call next Signed-off-by: Frédéric Demians Make sense. Add readability. Infinite loop no more possible. Signed-off-by: Jonathan Druart Signed-off-by: Jesse Weaver Patches previously applied in reverse order. --- C4/Biblio.pm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/C4/Biblio.pm b/C4/Biblio.pm index f08fc37470..10faa8336d 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -2515,13 +2515,12 @@ sub TransformHtmlToMarc { # creating a new record my $record = MARC::Record->new(); - my $i = 0; my @fields; my ($biblionumbertagfield, $biblionumbertagsubfield) = (-1, -1); ($biblionumbertagfield, $biblionumbertagsubfield) = &GetMarcFromKohaField( "biblio.biblionumber", '' ) if $isbiblio; #FIXME This code assumes that the CGI params will be in the same order as the fields in the template; this is no absolute guarantee! - while ( $params[$i] ) { # browse all CGI params + for (my $i = 0; $params[$i]; $i++ ) { # browse all CGI params my $param = $params[$i]; my $newfield = 0; @@ -2543,10 +2542,8 @@ sub TransformHtmlToMarc { if ( $tag < 10 ) { # no code for theses fields # in MARC editor, 000 contains the leader. - if ( $tag == $biblionumbertagfield ) { - # We do nothing and let $i be incremented - } - elsif ( $tag eq '000' ) { + next if $tag == $biblionumbertagfield; + if ( $tag eq '000' ) { # Force a fake leader even if not provided to avoid crashing # during decoding MARC record containing UTF-8 characters $record->leader( @@ -2585,7 +2582,6 @@ sub TransformHtmlToMarc { } push @fields, $newfield if ($newfield); } - $i++; } $record->append_fields(@fields); -- 2.39.5