From 5775529ae328ac4f957353abb63b59de98cee525 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Mon, 13 Aug 2012 17:04:05 +0200
Subject: [PATCH] Bug 8015: (follow-up) fix copy and move if subfields don't
 exist.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Leila <koha.aixmarseille@gmail.com>

Bug 8015: Followup: On move, we cant delete existing fields

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Leila <koha.aixmarseille@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 Koha/SimpleMARC.pm | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/Koha/SimpleMARC.pm b/Koha/SimpleMARC.pm
index 96a3af106d..82abe00461 100644
--- a/Koha/SimpleMARC.pm
+++ b/Koha/SimpleMARC.pm
@@ -74,7 +74,7 @@ at your option, any later version of Perl 5 you may have available.
 =cut
 
 sub copy_field {
-  my ( $record, $fromFieldName, $fromSubfieldName, $toFieldName, $toSubfieldName, $regex, $n ) = @_;
+  my ( $record, $fromFieldName, $fromSubfieldName, $toFieldName, $toSubfieldName, $regex, $n, $dont_erase ) = @_;
   C4::Koha::Log( "C4::SimpleMARC::copy_field( '$record', '$fromFieldName', '$fromSubfieldName', '$toFieldName', '$toSubfieldName', '$regex', '$n' )" ) if $debug;
 
   if ( ! ( $record && $fromFieldName && $toFieldName ) ) { return; }
@@ -90,7 +90,7 @@ sub copy_field {
     }
   }
 
-  update_field( $record, $toFieldName, $toSubfieldName, @values );
+  update_field( $record, $toFieldName, $toSubfieldName, @values, $dont_erase );
 
 }
 
@@ -109,7 +109,7 @@ sub copy_field {
 =cut
 
 sub update_field {
-  my ( $record, $fieldName, $subfieldName, @values ) = @_;
+  my ( $record, $fieldName, $subfieldName, @values, $dont_erase ) = @_;
   C4::Koha::Log( "C4::SimpleMARC::update_field( $record, $fieldName, $subfieldName, @values )" ) if $debug;
 
   if ( ! ( $record && $fieldName ) ) { return; }
@@ -123,8 +123,17 @@ sub update_field {
   my $field;
   if ( $subfieldName ) {
     if ( my @fields = $record->field( $fieldName ) ) {
-      foreach my $field ( @fields ) {
-        $field->update( "$subfieldName" => $values[$i++] );
+      unless ( $dont_erase ) {
+        foreach my $field ( @fields ) {
+          $field->update( "$subfieldName" => $values[$i++] );
+        }
+      }
+      if ( $i <= scalar @values - 1 ) {
+        foreach my $field ( @fields ) {
+          foreach my $j ( $i .. scalar( @values ) - 1) {
+            $field->add_subfields( "$subfieldName" => $values[$j] );
+          }
+        }
       }
     } else {
       ## Field does not exist, create it.
@@ -253,7 +262,7 @@ sub field_equals {
 sub move_field {
   my ( $record, $fromFieldName, $fromSubfieldName, $toFieldName, $toSubfieldName, $regex, $n ) = @_;
   C4::Koha::Log( "C4::SimpleMARC::move_field( '$record', '$fromFieldName', '$fromSubfieldName', '$toFieldName', '$toSubfieldName', '$regex', '$n' )" ) if $debug;
-  copy_field( $record, $fromFieldName, $fromSubfieldName, $toFieldName, $toSubfieldName, $regex, $n );
+  copy_field( $record, $fromFieldName, $fromSubfieldName, $toFieldName, $toSubfieldName, $regex, $n , "don't_erase");
   delete_field( $record, $fromFieldName, $fromSubfieldName, $n );
 }
 
-- 
2.39.5