From dc129570421add7a77d9f0764f623b917b1ba5fd Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 29 Apr 2020 16:19:00 +0200 Subject: [PATCH] Bug 25313: Add skip_merge to ModAuthority Sometimes you know that the merge is useless, since the reporting tag did not change. Might be handy in batch processing of authority records. Test plan: Pick an authority with a few linked biblio recs (so that it will immediately merge; lower than MergeLimit). Open authority record and save it. Verify that a linked biblio record was merged. Check time in 005. You proved that this patch does not break the regular process. Signed-off-by: Marcel de Rooy Signed-off-by: Phil Ringnalda Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 517dcabdf73acfaf01cde461beb8bac84f86c82e) Signed-off-by: Andrew Fuerste-Henry --- C4/AuthoritiesMarc.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index cbf59cdc03..3bfcd4e5ef 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -664,18 +664,19 @@ sub DelAuthority { =head2 ModAuthority - $authid= &ModAuthority($authid,$record,$authtypecode) + $authid= &ModAuthority($authid,$record,$authtypecode, [ { skip_merge => 1 ] ) Modifies authority record, optionally updates attached biblios. +The parameter skip_merge is optional and should be used with care. =cut sub ModAuthority { - my ( $authid, $record, $authtypecode ) = @_; + my ( $authid, $record, $authtypecode, $params ) = @_; my $oldrecord = GetAuthority($authid); #Now rewrite the $record to table with an add $authid = AddAuthority($record, $authid, $authtypecode); - merge({ mergefrom => $authid, MARCfrom => $oldrecord, mergeto => $authid, MARCto => $record }); + merge({ mergefrom => $authid, MARCfrom => $oldrecord, mergeto => $authid, MARCto => $record }) if !$params->{skip_merge}; logaction( "AUTHORITIES", "MODIFY", $authid, "authority BEFORE=>" . $oldrecord->as_formatted ) if C4::Context->preference("AuthoritiesLog"); return $authid; } -- 2.39.5