Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 24480: (follow-up) Shift new fields into array and add after all are copied

Browse source 
The updated code removed the pushing of fields to an array - this caused a bug.
When multiple fields were copied and replaced and there were more fields added than existed originally we were adding the new field to the end, then removing the first occurence of the original field. If we tried to move 2 650 fields to 651 and the record had no 651 we would:
- Delete the first 651, there were none, so nothing happened
- Take the first 650, add it to the end of the 651 group (there were none, so it became the first 651)
- Delete the first 651, which was the field we just copied
- Take the second 650 and add it to the end of the 651 group (whihc had none, because we deleted it)

I re-add the line, but do as suggesed by Phil and reverse the order (unshift vs push)

To test:
1 - Apply other patches
2 - prove -v t/SimpleMARC.t
3 - It fails
4 - Apply this patch
5 - prove -v t/SimpleMARC.t
6 - It still fails, but more tests pass (there's another patch to follow)

Signed-off-by: Phil Ringnalda <phil@chetcolibrary.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 498f0dfecc)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Nick Clemens 2023-09-15 19:59:57 +00:00 committed by Fridolin Somers
parent a3cc15af4d
commit 02a042d18f
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Koha/SimpleMARC.pm
View file

@ -575,13 +575,7 @@ sub _copy_move_field {
@from_fields = map { $_ <= @from_fields ? $from_fields[ $_ - 1 ] : () } @$field_numbers;
}
if ( $action eq 'replace' ) {
my @to_fields = $record->field( $toFieldName );
for my $to_field ( @to_fields ) {
$record->delete_field( $to_field );
}
}
my @new_fields;
for my $from_field ( @from_fields ) {
my $new_field = $from_field->clone;
$new_field->{_tag} = $toFieldName; # Should be replaced by set_tag, introduced by MARC::Field 2.0.4
@ -595,8 +589,15 @@ sub _copy_move_field {
if ( $action eq 'move' ) {
$record->delete_field( $from_field )
}
$record->insert_grouped_field( $new_field );
elsif ( $action eq 'replace' ) {
my @to_fields = $record->field( $toFieldName );
if( @to_fields ) {
$record->delete_field( $to_fields[0] );
}
}
unshift @new_fields, $new_field;
}
$record->insert_fields_ordered( @new_fields );
}
sub _copy_move_subfield {