Bugzilla – Attachment 59104 Details for
Bug 17913
Merge three authority merge fixes
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 17913: Use AuthorityMergeMode pref in sub merge
SIGNED-OFF-Bug-17913-Use-AuthorityMergeMode-pref-i.patch (text/plain), 1.54 KB, created by
Josef Moravec
on 2017-01-17 21:13:40 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 17913: Use AuthorityMergeMode pref in sub merge
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2017-01-17 21:13:40 UTC
Size:
1.54 KB
patch
obsolete
>From a0f85b98144dd276c56ca278b09f8c3758df0b5b Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Fr=C3=A9d=C3=A9rick?= <frederick.capovilla@libeo.com> >Date: Wed, 27 Nov 2013 12:30:55 -0500 >Subject: [PATCH] [SIGNED-OFF] Bug 17913: Use AuthorityMergeMode pref in sub > merge > >Original fix from a patch on bug 11315. >Amended by Marcel de Rooy January 2017. > >Test plan: >If you set mode to loose, the test will still pass. >If you set mode to strict, one test will fail. (Fixed later.) > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> > >Signed-off-by: Josef Moravec <josef.moravec@gmail.com> >--- > C4/AuthoritiesMarc.pm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > >diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm >index 9840d60..131bc07 100644 >--- a/C4/AuthoritiesMarc.pm >+++ b/C4/AuthoritiesMarc.pm >@@ -1473,6 +1473,7 @@ sub merge { > } > # BulkEdit marc records > # May be used as a template for a bulkedit field >+ my $overwrite = C4::Context->preference( 'AuthorityMergeMode' ) eq 'strict'; > foreach my $marcrecord(@reccache){ > my $update = 0; > foreach my $tagfield (@tags_using_authtype){ >@@ -1490,7 +1491,7 @@ sub merge { > } > $exclude='['.$exclude.']'; > # add subfields in $field not included in @record_to >- my @restore= grep {$_->[0]!~/$exclude/} $field->subfields(); >+ my @restore= $overwrite ? () : grep {$_->[0]!~/$exclude/} $field->subfields(); > foreach my $subfield (@restore) { > $field_to->add_subfields($subfield->[0] =>$subfield->[1]); > } >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17913
:
59009
|
59010
|
59016
|
59017
|
59065
|
59066
|
59073
|
59078
|
59079
|
59080
|
59081
|
59082
|
59083
|
59084
|
59085
|
59089
|
59090
|
59102
|
59103
|
59104
|
59105
|
59106
|
59107
|
59108
|
59109
|
59110
|
59325
|
59326
|
59327
|
59328
|
59329
|
59330
|
59331
|
59332
|
59333
|
59352
|
59358
|
59360
|
59361
|
59362
|
59363
|
59364
|
59365
|
59366
|
59367
|
59368
|
59369
|
59370
|
59411
|
59412
|
59413
|
60042
|
60043
|
60341
|
60342