Attachment 46568 Details for Bug 6657 – Bug 6657: TransformHtmlToMarc - rewrite the loop

[patch] Bug 6657: TransformHtmlToMarc - rewrite the loop

Bug-6657-TransformHtmlToMarc---rewrite-the-loop.patch (text/plain), 2.07 KB, created by Julian Maurice on 2016-01-13 08:16:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2016-01-13 08:16:09 UTC

Size: 2.07 KB

patch

obsolete

>From 6e4127858e862fa7cfaafa55f699a8f286e355ab Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Tue, 12 Jan 2016 16:49:15 +0100
>Subject: [PATCH] Bug 6657: TransformHtmlToMarc - rewrite the loop
>
>This rewrites the while loop into a for loop, so $i still gets
>incremented when we call next
>---
> C4/Biblio.pm | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
>diff --git a/C4/Biblio.pm b/C4/Biblio.pm
>index f08fc37..10faa83 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);
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 6657: 42667 | 44199 | 44869 | 46517 | 46536 | 46537 | 46538 | 46542 | 46543 | 46544 | 46545 | 46547 | 46568 | 46569