Bugzilla – Attachment 59065 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]
Bug 17913: Fix the new field tag in merge when changing type
Bug-17913-Fix-the-new-field-tag-in-merge-when-chan.patch (text/plain), 11.87 KB, created by
Marcel de Rooy
on 2017-01-17 07:44:10 UTC
(
hide
)
Description:
Bug 17913: Fix the new field tag in merge when changing type
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2017-01-17 07:44:10 UTC
Size:
11.87 KB
patch
obsolete
>From 25554c5b98c2f30f17db17dca3514313d16bd56a Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Mon, 16 Jan 2017 14:54:37 +0100 >Subject: [PATCH] Bug 17913: Fix the new field tag in merge when changing type >Content-Type: text/plain; charset=utf-8 > >Originally aimed for 9988, adjusted for this report. > >Old behavior was: pick the first tag. This is definitely wrong. >If you (would) merge 610 to 611, you don't want to get a 111. > >This patch resolves the problem by determining the new tag in a small >helper routine _merge_newtag, and corrects the position of the new field >in the MARC record with append_fields_ordered. Too bad that MARC::Record >does not have such a function; it looks like insert_fields_ordered, but >it is different in case of multiple fields with the same tag. > >Note: These two small helper functions are not tested separately, since they >should not be called outside of merge. They are implicitly tested by the >adjusted tests in Merge.t. > >Test plan: >Run t/db_dependent/Authorities/Merge.t > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > C4/AuthoritiesMarc.pm | 64 +++++++++++++++++++++++-------- > t/db_dependent/Authorities/Merge.t | 77 +++++++++++++++++++++++--------------- > 2 files changed, 95 insertions(+), 46 deletions(-) > >diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm >index 131bc07..53be7d2 100644 >--- a/C4/AuthoritiesMarc.pm >+++ b/C4/AuthoritiesMarc.pm >@@ -1458,32 +1458,33 @@ sub merge { > #warn scalar(@reccache)." biblios to update"; > # Get All candidate Tags for the change > # (This will reduce the search scope in marc records). >- my $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where authtypecode=?"); >- $sth->execute($authtypefrom->authtypecode); >- my @tags_using_authtype; >- while (my ($tagfield) = $sth->fetchrow) { >- push @tags_using_authtype,$tagfield ; >- } >- my $tag_to=0; >+ my $sql = "SELECT DISTINCT tagfield FROM marc_subfield_structure WHERE authtypecode=?"; >+ my $tags_using_authtype = $dbh->selectcol_arrayref( $sql, undef, ( $authtypefrom->authtypecode )); >+ my $tags_new; > if ($authtypeto->authtypecode ne $authtypefrom->authtypecode){ >- # If many tags, take the first >- $sth->execute($authtypeto->authtypecode); >- $tag_to=$sth->fetchrow; >- #warn $tag_to; >+ $tags_new = $dbh->selectcol_arrayref( $sql, undef, ( $authtypeto->authtypecode )); > } > # 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){ >+ foreach my $tagfield (@$tags_using_authtype){ > # warn "tagfield : $tagfield "; > foreach my $field ($marcrecord->field($tagfield)){ > # biblio is linked to authority with $9 subfield containing authid > my $auth_number=$field->subfield("9"); >- my $tag=$field->tag(); >+ my $tag=$field->tag(); >+ my $newtag = $tags_new >+ ? _merge_newtag( $tag, $tags_new ) >+ : $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 $field_to = MARC::Field->new( >+ $newtag, >+ $field->indicator(1), >+ $field->indicator(2), >+ "9" => $mergeto, >+ ); > my $exclude='9'; > foreach my $subfield (grep {$_->[0] ne '9'} @record_to) { > $field_to->add_subfields($subfield->[0] =>$subfield->[1]); >@@ -1495,7 +1496,12 @@ sub merge { > foreach my $subfield (@restore) { > $field_to->add_subfields($subfield->[0] =>$subfield->[1]); > } >- $field->replace_with($field_to); >+ if( $tags_new ) { >+ $marcrecord->delete_field( $field ); >+ append_fields_ordered( $marcrecord, $field_to ); >+ } else { >+ $field->replace_with($field_to); >+ } > $update=1; > } > }#for each tag >@@ -1569,6 +1575,34 @@ sub merge { > # }#foreach $marc > }#sub > >+sub _merge_newtag { >+# Routine is only called for an (exceptional) authtypecode change >+# Fixes old behavior of returning the first tag found >+ my ( $oldtag, $new_tags ) = @_; >+ >+ # If we e.g. have 650 and 151,651,751 try 651 and check presence >+ my $prefix = substr( $oldtag, 0, 1 ); >+ my $guess = $prefix . substr( $new_tags->[0], -2 ); >+ if( grep { $_ eq $guess } @$new_tags ) { >+ return $guess; >+ } >+ # Otherwise return one from the same block e.g. 6XX for 650 >+ # If not there too, fall back to first new tag (old behavior!) >+ my @same_block = grep { /^$prefix/ } @$new_tags; >+ return @same_block ? $same_block[0] : $new_tags->[0]; >+} >+ >+sub append_fields_ordered { >+# while we lack this function in MARC::Record >+# we do not want insert_fields_ordered since it inserts before >+ my ( $record, $field ) = @_; >+ if( my @flds = $record->field( $field->tag ) ) { >+ $record->insert_fields_after( pop @flds, $field ); >+ } else { # now fallback to insert_fields_ordered >+ $record->insert_fields_ordered( $field ); >+ } >+} >+ > =head2 get_auth_type_location > > my ($tag, $subfield) = get_auth_type_location($auth_type_code); >diff --git a/t/db_dependent/Authorities/Merge.t b/t/db_dependent/Authorities/Merge.t >index 2c2b0a4..7ce96b1 100755 >--- a/t/db_dependent/Authorities/Merge.t >+++ b/t/db_dependent/Authorities/Merge.t >@@ -67,14 +67,14 @@ subtest 'Test merge A1 to A2 (withing same authtype)' => sub { > > # Check the results > my $newbiblio1 = GetMarcBiblio($biblionumber1); >- compare_field_count( $biblio1, $newbiblio1, 1 ); >- compare_field_order( $biblio1, $newbiblio1, 1 ); >+ compare_field_count( $biblio1, $newbiblio1 ); >+ compare_field_order( $biblio1, $newbiblio1 ); > is( $newbiblio1->subfield('609', '9'), $authid1, 'Check biblio1 609$9' ); > is( $newbiblio1->subfield('609', 'a'), 'George Orwell', > 'Check biblio1 609$a' ); > my $newbiblio2 = GetMarcBiblio($biblionumber2); >- compare_field_count( $biblio2, $newbiblio2, 1 ); >- compare_field_order( $biblio2, $newbiblio2, 1 ); >+ compare_field_count( $biblio2, $newbiblio2 ); >+ compare_field_order( $biblio2, $newbiblio2 ); > is( $newbiblio2->subfield('609', '9'), $authid1, 'Check biblio2 609$9' ); > is( $newbiblio2->subfield('609', 'a'), 'George Orwell', > 'Check biblio2 609$a' ); >@@ -110,12 +110,12 @@ subtest 'Test merge A1 to modified A1' => sub { > > #Check the results > my $biblio1 = GetMarcBiblio($biblionumber1); >- compare_field_count( $MARC1, $biblio1, 1 ); >- compare_field_order( $MARC1, $biblio1, 1 ); >+ compare_field_count( $MARC1, $biblio1 ); >+ compare_field_order( $MARC1, $biblio1 ); > is( $auth1new->field(109)->subfield('a'), $biblio1->field(109)->subfield('a'), 'Record1 values updated correctly' ); > my $biblio2 = GetMarcBiblio($biblionumber1); >- compare_field_count( $MARC2, $biblio2, 1 ); >- compare_field_order( $MARC2, $biblio2, 1 ); >+ compare_field_count( $MARC2, $biblio2 ); >+ compare_field_order( $MARC2, $biblio2 ); > is( $auth1new->field(109)->subfield('a'), $biblio2->field(109)->subfield('a'), 'Record2 values updated correctly' ); > # This is only true in loose mode: > is( $biblio1->field(109)->subfield('b'), $MARC1->field(109)->subfield('b'), 'Subfield not overwritten in loose mode'); >@@ -135,7 +135,7 @@ subtest 'Test merge A1 to B1 (changing authtype)' => sub { > # Tests were aimed for bug 9988, moved to 17909 in adjusted form > # Would not encourage this type of merge, but we should test what we offer > # The merge routine still needs the fixes on bug 17913 >- plan tests => 8; >+ plan tests => 12; > > # create two auth recs of different type > my $auth1 = MARC::Record->new; >@@ -168,9 +168,14 @@ subtest 'Test merge A1 to B1 (changing authtype)' => sub { > > # Get new marc record for compares > my $newbiblio = C4::Biblio::GetMarcBiblio( $biblionumber ); >- compare_field_count( $oldbiblio, $newbiblio, 1 ); >- # TODO The following test will still fail; refined after 17913 >- compare_field_order( $oldbiblio, $newbiblio, 0 ); >+ compare_field_count( $oldbiblio, $newbiblio ); >+ # Exclude 109/609 and 112/612 in comparing order >+ compare_field_order( $oldbiblio, $newbiblio, >+ { '109' => 1, '112' => 1, '609' => 1, '612' => 1 }, >+ ); >+ # Check position of 612s in the new record >+ my $full_order = join q/,/, map { $_->tag } $newbiblio->fields; >+ is( $full_order =~ /611(,612){3}/, 1, 'Check position of all 612s' ); > > # Check some fields > is( $newbiblio->field('003')->data, >@@ -184,9 +189,18 @@ subtest 'Test merge A1 to B1 (changing authtype)' => sub { > is( $newbiblio->subfield( '112', 'c' ), > $auth2->subfield( '112', 'c' ), 'Check new 112c' ); > >- #TODO Check the new 612s (after fix on 17913, they are 112s now) >- is( $newbiblio->subfield( '612', 'a' ), >+ # Check the original 612 >+ is( ( $newbiblio->field('612') )[0]->subfield( 'a' ), > $oldbiblio->subfield( '612', 'a' ), 'Check untouched 612a' ); >+ # Check second 612 >+ is( ( $newbiblio->field('612') )[1]->subfield( 'a' ), >+ $auth2->subfield( '112', 'a' ), 'Check second touched 612a' ); >+ # Check second new 612ax (in LOOSE mode) >+ is( ( $newbiblio->field('612') )[2]->subfield( 'a' ), >+ $auth2->subfield( '112', 'a' ), 'Check touched 612a' ); >+ is( ( $newbiblio->field('612') )[2]->subfield( 'x' ), >+ ( $oldbiblio->field('609') )[1]->subfield('x'), >+ 'Check 612x' ); > }; > > sub set_mocks { >@@ -243,7 +257,7 @@ sub modify_framework { > }, > }); > >- # Link 112/712 to the second authtype >+ # Link 112/612/712 to the second authtype > $builder->build({ > source => 'MarcSubfieldStructure', > value => { >@@ -256,6 +270,15 @@ sub modify_framework { > $builder->build({ > source => 'MarcSubfieldStructure', > value => { >+ tagfield => '612', >+ tagsubfield => 'a', >+ authtypecode => $authtype2->{authtypecode}, >+ frameworkcode => '', >+ }, >+ }); >+ $builder->build({ >+ source => 'MarcSubfieldStructure', >+ value => { > tagfield => '712', > tagsubfield => 'a', > authtypecode => $authtype2->{authtypecode}, >@@ -267,26 +290,18 @@ sub modify_framework { > } > > sub compare_field_count { >- my ( $oldmarc, $newmarc, $pass ) = @_; >+ my ( $oldmarc, $newmarc ) = @_; > my $t; >- if( $pass ) { >- is( scalar $newmarc->fields, $t = $oldmarc->fields, "Number of fields still equal to $t" ); >- } else { >- isnt( scalar $newmarc->fields, $t = $oldmarc->fields, "Number of fields not equal to $t" ); >- } >+ is( scalar $newmarc->fields, $t = $oldmarc->fields, "Number of fields still equal to $t" ); > } > > sub compare_field_order { >- my ( $oldmarc, $newmarc, $pass ) = @_; >- if( $pass ) { >- is( ( join q/,/, map { $_->tag; } $newmarc->fields ), >- ( join q/,/, map { $_->tag; } $oldmarc->fields ), >- 'Order of fields unchanged' ); >- } else { >- isnt( ( join q/,/, map { $_->tag; } $newmarc->fields ), >- ( join q/,/, map { $_->tag; } $oldmarc->fields ), >- 'Order of fields changed' ); >- } >+ my ( $oldmarc, $newmarc, $exclude ) = @_; >+ $exclude //= {}; >+ my @oldfields = map { $exclude->{$_->tag} ? () : $_->tag } $oldmarc->fields; >+ my @newfields = map { $exclude->{$_->tag} ? () : $_->tag } $newmarc->fields; >+ is( ( join q/,/, @newfields ), ( join q/,/, @oldfields ), >+ 'Order of fields unchanged' ); > } > > $schema->storage->txn_rollback; >-- >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