From 411a8858294195d5b3d8f891a00e26f423ad4e29 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 19 Jul 2024 08:57:54 -0400 Subject: [PATCH] Bug 36515: (QA follow-up) Tidy code Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer --- Koha/SimpleMARC.pm | 13 +++++++------ t/SimpleMARC.t | 9 ++------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Koha/SimpleMARC.pm b/Koha/SimpleMARC.pm index 6b15b8d939..425fbcd75b 100644 --- a/Koha/SimpleMARC.pm +++ b/Koha/SimpleMARC.pm @@ -135,12 +135,12 @@ sub copy_and_replace_field { if ( ! ( $record && $fromFieldName && $toFieldName ) ) { return; } - if ( - ( !defined $fromSubfieldName or $fromSubfieldName eq '' ) - and ( !defined $toSubfieldName or $toSubfieldName eq '' ) - ) { + if ( ( !defined $fromSubfieldName or $fromSubfieldName eq '' ) + and ( !defined $toSubfieldName or $toSubfieldName eq '' ) ) + { _copy_move_field( - { record => $record, + { + record => $record, from_field => $fromFieldName, to_field => $toFieldName, regex => $regex, @@ -150,7 +150,8 @@ sub copy_and_replace_field { ); } else { _copy_move_subfield( - { record => $record, + { + record => $record, from_field => $fromFieldName, from_subfield => $fromSubfieldName, to_field => $toFieldName, diff --git a/t/SimpleMARC.t b/t/SimpleMARC.t index da6b98ff7f..597ec8c412 100755 --- a/t/SimpleMARC.t +++ b/t/SimpleMARC.t @@ -1526,14 +1526,9 @@ subtest 'copy_and_replace_field' => sub { ); # Copy control field to subfield - copy_and_replace_field( - { record => $record, from_field => '001', to_field => '099', to_subfield => 'a' } ); + copy_and_replace_field( { record => $record, from_field => '001', to_field => '099', to_subfield => 'a' } ); is_deeply( - [ - read_field( - { record => $record, field => '099', subfield => 'a' } - ) - ], + [ read_field( { record => $record, field => '099', subfield => 'a' } ) ], ['4815162342'], 'Copy and replace - Update a subfield with content of control field' ); -- 2.39.5