From 31b54655b883a006b4760f096650ce442755e343 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 21 Jul 2014 09:55:02 -0400 Subject: [PATCH] Bug 12375 [5] [QA Followup] - Don't assume X Y and Z are used in order --- installer/data/mysql/updatedatabase.pl | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index bb549d1..2e0bf6c 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8593,7 +8593,17 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { foreach my $subscription (@subscriptions) { my $number_pattern = $subscription->numberpattern(); - my @splits = split( /\{[XYZ]\}/, $number_pattern->numberingmethod() ); + my $numbering_method = $number_pattern->numberingmethod(); + # Get all the data between the enumeration values, we need + # to split each enumeration string based on these values. + my @splits = split( /\{[XYZ]\}/, $numbering_method ); + # Get the order in which the X Y and Z values are used + my %indexes; + foreach my $i (qw(X Y Z)) { + $indexes{$i} = index( $numbering_method, "{$i}" ); + delete $indexes{$i} if $indexes{$i} == -1; + } + my @indexes = sort { $indexes{$a} <=> $indexes{$b} } keys(%indexes); my @serials = $schema->resultset('Serial') @@ -8601,24 +8611,29 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { foreach my $serial (@serials) { my $serialseq = $serial->serialseq(); - my ( $x, $y, $z ); + my %enumeration_data; ## We cannot split on multiple values at once, ## so let's replace each of those values with __SPLIT__ if (@splits) { map( $serialseq =~ s/$_/__SPLIT__/, @splits ); - ( undef, $x, $y, $z ) = split( /__SPLIT__/, $serialseq ); + ( + undef, + $enumeration_data{ $indexes[0] }, + $enumeration_data{ $indexes[1] }, + $enumeration_data{ $indexes[2] } + ) = split( /__SPLIT__/, $serialseq ); } else - { ## Nothing to split on means the only thing in serialseq is {X} - $x = $serialseq; + { ## Nothing to split on means the only thing in serialseq is a single placeholder e.g. {X} + $enumeration_data{ $indexes[0] } = $serialseq; } $serial->update( { - serialseq_x => $x, - serialseq_y => $y, - serialseq_z => $z, + serialseq_x => $enumeration_data{'X'}, + serialseq_y => $enumeration_data{'Y'}, + serialseq_z => $enumeration_data{'Z'}, } ); } -- 1.7.2.5