From aced21b487f243f4d86f5f9b9e62afa33c4dcac0 Mon Sep 17 00:00:00 2001 From: mxbeaulieu Date: Mon, 15 Jun 2015 11:05:51 -0400 Subject: [PATCH] [SIGNED OFF] Bug 14387 - Merge reference selection has no effect when merging authorities. This patch swaps the authority records according to the refenrece record selection. To TEST: Merge two authority records, select the second as merge reference. The reference authority is always the first. Apply the patch. Repeat previous steps, the authority is now merged using the selected reference record. modified: authorities/merge.pl Signed-off-by: Nick Clemens --- authorities/merge.pl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/authorities/merge.pl b/authorities/merge.pl index 6f2b154..476b774 100755 --- a/authorities/merge.pl +++ b/authorities/merge.pl @@ -123,10 +123,13 @@ else { } } - my $notreference = - ( $authid[0] == $mergereference ) - ? $authid[1] - : $authid[0]; + #Setting $notreference + my $notreference = $authid[1]; + if($mergereference == $notreference){ + $notreference = $authid[0]; + #Swap so $recordObj1 is always the correct merge reference + ($recordObj1, $recordObj2) = ($recordObj2, $recordObj1); + } # Creating a loop for display -- 1.7.10.4