Attachment 84313 Details for Bug 21957 – Bug 21957: Add a flag to ModBiblio to avoid linking auths if called from linker

[patch] Bug 21957: Add a flag to ModBiblio to avoid linking auths if called from linker

Bug-21957-Add-a-flag-to-ModBiblio-to-avoid-linking.patch (text/plain), 3.71 KB, created by Nick Clemens (kidclamp) on 2019-01-23 01:12:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2019-01-23 01:12:09 UTC

Size: 3.71 KB

patch

obsolete

>From 50568ba7e405decdd949451c40fe6eae15e0910d Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Wed, 5 Dec 2018 21:05:32 +0000
>Subject: [PATCH] Bug 21957: Add a flag to ModBiblio to avoid linking auths if
> called from linker
>
>To test:
>1 - prove -v t/db_dependent/Biblio.t
>2 - Set BiblioAddsAuthoorities and AutoCreateAuthorities
>3 - Modify a biblio to add a heading with no existing auth record
>4 - Ensure the record was created on saving
>5 - Ensure that editing works as normal otherwise
>6 - Run link_bibs_to_authorities
>7 - Ensure results are as expected
>---
> C4/Biblio.pm                     |  6 ++----
> misc/link_bibs_to_authorities.pl |  3 ++-
> t/db_dependent/Biblio.t          | 19 ++++++++++++++++++-
> 3 files changed, 22 insertions(+), 6 deletions(-)
>
>diff --git a/C4/Biblio.pm b/C4/Biblio.pm
>index 808ed8d067..36d1cb8a0c 100644
>--- a/C4/Biblio.pm
>+++ b/C4/Biblio.pm
>@@ -262,7 +262,7 @@ Returns 1 on success 0 on failure
> =cut
> 
> sub ModBiblio {
>-    my ( $record, $biblionumber, $frameworkcode ) = @_;
>+    my ( $record, $biblionumber, $frameworkcode, $called_by_linker ) = @_;
>     if (!$record) {
>         carp 'No record passed to ModBiblio';
>         return 0;
>@@ -273,7 +273,7 @@ sub ModBiblio {
>         logaction( "CATALOGUING", "MODIFY", $biblionumber, "biblio BEFORE=>" . $newrecord->as_formatted );
>     }
> 
>-    if (C4::Context->preference('BiblioAddsAuthorities')) {
>+    if (C4::Context->preference('BiblioAddsAuthorities') && !$called_by_linker) {
>         BiblioAutoLink( $record, $frameworkcode );
>     }
> 
>@@ -622,12 +622,10 @@ safest place.
> 
> sub _check_valid_auth_link {
>     my ( $authid, $field ) = @_;
>-
>     require C4::AuthoritiesMarc;
> 
>     my $authorized_heading =
>       C4::AuthoritiesMarc::GetAuthorizedHeading( { 'authid' => $authid } ) || '';
>-
>    return ($field->as_string('abcdefghijklmnopqrstuvwxyz') eq $authorized_heading);
> }
> 
>diff --git a/misc/link_bibs_to_authorities.pl b/misc/link_bibs_to_authorities.pl
>index 2711d16537..598ce8a010 100755
>--- a/misc/link_bibs_to_authorities.pl
>+++ b/misc/link_bibs_to_authorities.pl
>@@ -220,7 +220,8 @@ sub process_bib {
>             );
>         }
>         if ( not $test_only ) {
>-            ModBiblio( $bib, $biblionumber, $frameworkcode );
>+            ModBiblio( $bib, $biblionumber, $frameworkcode, 1 ); 
>+            #Last param is to note ModBiblio was called from linking script and bib should not be linked again
>             $num_bibs_modified++;
>         }
>     }
>diff --git a/t/db_dependent/Biblio.t b/t/db_dependent/Biblio.t
>index 1f954dcca0..5039f0da3b 100755
>--- a/t/db_dependent/Biblio.t
>+++ b/t/db_dependent/Biblio.t
>@@ -17,7 +17,7 @@
> 
> use Modern::Perl;
> 
>-use Test::More tests => 11;
>+use Test::More tests => 12;
> use Test::MockModule;
> use List::MoreUtils qw( uniq );
> use MARC::Record;
>@@ -495,6 +495,23 @@ subtest 'MarcFieldForCreatorAndModifier' => sub {
>     is($record->subfield('998', 'd'), 'Jane Doe', '998$d = Jane Doe');
> };
> 
>+subtest 'ModBiblio called from linker test' => sub {
>+    plan tests => 2;
>+    my $called = 0;
>+    t::lib::Mocks::mock_preference('BiblioAddsAuthorities', 1);
>+    my $biblio_mod = Test::MockModule->new( 'C4::Biblio' );
>+    $biblio_mod->mock( 'LinkBibHeadingsToAuthorities', sub {
>+        $called = 1;
>+    });
>+    my $record = MARC::Record->new();
>+    my ($biblionumber) = C4::Biblio::AddBiblio($record,'');
>+    C4::Biblio::ModBiblio($record,$biblionumber,'');
>+    is($called,1,"We called to link bibs because not from linker");
>+    $called = 0;
>+    C4::Biblio::ModBiblio($record,$biblionumber,'',1);
>+    is($called,0,"We didn't call to link bibs because from linker");
>+};
>+
> # Cleanup
> Koha::Caches->get_instance->clear_from_cache( "MarcSubfieldStructure-" );
> $schema->storage->txn_rollback;
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21957: 82893 | 84313 | 88001 | 88033 | 88161