@@ -, +, @@ --- C4/AuthoritiesMarc.pm | 24 +++++++++++++--------- ...FIELD_DELETION_WHEN_DOING_AUTHORITY_MERGES.perl | 6 ++++++ installer/data/mysql/sysprefs.sql | 1 + .../en/modules/admin/preferences/authorities.pref | 7 +++++++ 4 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/BZ11315_ADD_SUPPORT_FOR_SUBFIELD_DELETION_WHEN_DOING_AUTHORITY_MERGES.perl --- a/C4/AuthoritiesMarc.pm +++ a/C4/AuthoritiesMarc.pm @@ -1399,7 +1399,7 @@ sub AddAuthorityTrees{ =head2 merge - $ref= &merge(mergefrom,$MARCfrom,$mergeto,$MARCto) + $ref= &merge(mergefrom,$MARCfrom,$mergeto,$MARCto,$overwrite) Could add some feature : Migrating from a typecode to an other for instance. Then we should add some new parameter : bibliotargettag, authtargettag @@ -1407,7 +1407,8 @@ Then we should add some new parameter : bibliotargettag, authtargettag =cut sub merge { - my ($mergefrom,$MARCfrom,$mergeto,$MARCto) = @_; + my ($mergefrom,$MARCfrom,$mergeto,$MARCto,$overwrite) = @_; + $overwrite = C4::Context->preference('overwriteSubfieldsOnMerge') unless defined $overwrite; my ($counteditedbiblio,$countunmodifiedbiblio,$counterrors)=(0,0,0); my $dbh=C4::Context->dbh; my $authfrom = Koha::Authorities->find($mergefrom); @@ -1483,17 +1484,20 @@ sub merge { my $tag=$field->tag(); if ($auth_number==$mergefrom) { my $field_to=MARC::Field->new(($tag_to?$tag_to:$tag),$field->indicator(1),$field->indicator(2),"9"=>$mergeto); - my $exclude='9'; + my $exclude='9'; foreach my $subfield (grep {$_->[0] ne '9'} @record_to) { $field_to->add_subfields($subfield->[0] =>$subfield->[1]); - $exclude.= $subfield->[0]; + $exclude.= $subfield->[0]; } - $exclude='['.$exclude.']'; -# add subfields in $field not included in @record_to - my @restore= grep {$_->[0]!~/$exclude/} $field->subfields(); - foreach my $subfield (@restore) { - $field_to->add_subfields($subfield->[0] =>$subfield->[1]); - } + $exclude='['.$exclude.']'; + unless($overwrite) { + # add subfields in $field not included in @record_to + my @restore= grep {$_->[0]!~/$exclude/} $field->subfields(); + foreach my $subfield (@restore) { + $field_to->add_subfields($subfield->[0] =>$subfield->[1]); + } + } + $marcrecord->delete_field($field); $marcrecord->insert_grouped_field($field_to); $update=1; --- a/installer/data/mysql/atomicupdate/BZ11315_ADD_SUPPORT_FOR_SUBFIELD_DELETION_WHEN_DOING_AUTHORITY_MERGES.perl +++ a/installer/data/mysql/atomicupdate/BZ11315_ADD_SUPPORT_FOR_SUBFIELD_DELETION_WHEN_DOING_AUTHORITY_MERGES.perl @@ -0,0 +1,6 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('overwriteSubfieldsOnMerge','0',NULL,'Overwrite the biblio\\'s subfields when merging an authority record with a biblio record.','YesNo')"); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 11315 - Add the overwriteSubfieldsOnMerge preference)\n"; +} --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -389,6 +389,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OverdueNoticeCalendar',0,NULL,'Take the calendar into consideration when generating overdue notices','YesNo'), ('OverduesBlockCirc','noblock','noblock|confirmation|block','When checking out an item should overdues block checkout, generate a confirmation dialogue, or allow checkout','Choice'), ('OverduesBlockRenewing','allow','allow|blockitem|block','If any of patron checked out documents is late, should renewal be allowed, blocked only on overdue items or blocked on whatever checked out document','Choice'), +('overwriteSubfieldsOnMerge','0',NULL,'Overwrite the biblio\'s subfields when merging an authority record with a biblio record.','YesNo'), ('patronimages','0',NULL,'Enable patron images for the Staff Client','YesNo'), ('PatronSelfModificationBorrowerUnwantedField','',NULL,'Name the fields you don\'t want to display when a patron is editing their information via the OPAC.','free'), ('PatronSelfRegistration','0',NULL,'If enabled, patrons will be able to register themselves via the OPAC.','YesNo'), --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref @@ -44,6 +44,13 @@ Authorities: no: "Don't use" - authority record numbers instead of text strings for searches from subject tracings. - + - pref: overwriteSubfieldsOnMerge + default: no + choices: + yes: Overwrite + no: "Don't overwrite" + - "the biblio's subfields when merging an authority record with a biblio record." + - - Use the following text for the contents of UNIMARC authority field 100 position 08-35 (fixed length data elements). Do NOT include the date (position 00-07). - pref: UNIMARCAuthorityField100 defautl: "afrey50 ba0" --