From ae793a1a6705c9ed865d6145c12d4878ce37f58a Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Wed, 12 Jan 2022 21:05:29 -1000 Subject: [PATCH] Bug 29871: Remove marcflavour param in Koha::Biblio->get_marc_notes Test plan : Display a biblio record with some MARC notes in details page and basket, OPAC and staff Run prove t/db_dependent/Koha/Biblio.t --- Koha/Biblio.pm | 4 ++-- basket/basket.pl | 2 +- catalogue/detail.pl | 2 +- opac/opac-basket.pl | 2 +- opac/opac-detail.pl | 2 +- t/db_dependent/Koha/Biblio.t | 6 ++++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Koha/Biblio.pm b/Koha/Biblio.pm index a259db4bb7..b8142a1dd9 100644 --- a/Koha/Biblio.pm +++ b/Koha/Biblio.pm @@ -912,7 +912,7 @@ sub cover_images { =head3 get_marc_notes - $marcnotesarray = $biblio->get_marc_notes({ marcflavour => $marcflavour }); + $marcnotesarray = $biblio->get_marc_notes({ opac => 1 }); Get all notes from the MARC record and returns them in an array. The notes are stored in different fields depending on MARC flavour. @@ -923,7 +923,7 @@ MARC21 5XX $u subfields receive special attention as they are URIs. sub get_marc_notes { my ( $self, $params ) = @_; - my $marcflavour = $params->{marcflavour}; + my $marcflavour = C4::Context->preference('marcflavour'); my $opac = $params->{opac}; my $scope = $marcflavour eq "UNIMARC"? '3..': '5..'; diff --git a/basket/basket.pl b/basket/basket.pl index 80a30ecee5..fc30ab9355 100755 --- a/basket/basket.pl +++ b/basket/basket.pl @@ -68,7 +68,7 @@ foreach my $biblionumber ( @bibs ) { my $biblio = Koha::Biblios->find( $biblionumber ) or next; my $dat = $biblio->unblessed; my $record = &GetMarcBiblio({ biblionumber => $biblionumber }); - my $marcnotesarray = $biblio->get_marc_notes({ marcflavour => $marcflavour }); + my $marcnotesarray = $biblio->get_marc_notes; my $marcauthorsarray = $biblio->get_marc_authors; my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); my $marcseriesarray = GetMarcSeries ($record,$marcflavour); diff --git a/catalogue/detail.pl b/catalogue/detail.pl index bc28f29cc1..e0daa80133 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -145,7 +145,7 @@ $template->param( normalized_isbn => $isbn, ); -my $marcnotesarray = $biblio->get_marc_notes({ marcflavour => $marcflavour }); +my $marcnotesarray = $biblio->get_marc_notes; my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search->unblessed } }; diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl index ef137b95b0..1d71052bb0 100755 --- a/opac/opac-basket.pl +++ b/opac/opac-basket.pl @@ -90,7 +90,7 @@ foreach my $biblionumber ( @bibs ) { }); $record_processor->process($record); next unless $record; - my $marcnotesarray = $biblio->get_marc_notes({ marcflavour => $marcflavour, opac => 1 }); + my $marcnotesarray = $biblio->get_marc_notes({ opac => 1 }); my $marcauthorsarray = $biblio->get_marc_authors; my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); my $marcseriesarray = GetMarcSeries ($record,$marcflavour); diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 1c705db734..57bdb3b95b 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -782,7 +782,7 @@ if (scalar(@itemloop) == 0 || scalar(@otheritemloop) == 0) { } } -my $marcnotesarray = $biblio->get_marc_notes({ marcflavour => $marcflavour, opac => 1 }); +my $marcnotesarray = $biblio->get_marc_notes({ opac => 1 }); if( C4::Context->preference('ArticleRequests') ) { my $patron = $borrowernumber ? Koha::Patrons->find($borrowernumber) : undef; diff --git a/t/db_dependent/Koha/Biblio.t b/t/db_dependent/Koha/Biblio.t index a2c0e52320..521157d9fd 100755 --- a/t/db_dependent/Koha/Biblio.t +++ b/t/db_dependent/Koha/Biblio.t @@ -702,7 +702,7 @@ subtest 'get_marc_notes() MARC21 tests' => sub { C4::Biblio::ModBiblio( $record, $biblio->biblionumber ); $biblio = Koha::Biblios->find( $biblio->biblionumber); - my $notes = $biblio->get_marc_notes({ marcflavour => 'MARC21' }); + my $notes = $biblio->get_marc_notes; is( $notes->[0]->{marcnote}, 'Note1', 'First note' ); is( $notes->[1]->{marcnote}, 'Note2', 'Second note' ); is( $notes->[2]->{marcnote}, 'http://someserver.com', 'URL separated' ); @@ -710,7 +710,7 @@ subtest 'get_marc_notes() MARC21 tests' => sub { is( $notes->[4]->{marcnote}, 'Note5', 'Fifth note' ); is( $notes->[5]->{marcnote}, 'Description should show', 'Authorised value is correctly parsed to show description rather than code' ); is( @$notes, 6, 'No more notes' ); - $notes = $biblio->get_marc_notes({ marcflavour => 'MARC21', opac => 1 }); + $notes = $biblio->get_marc_notes({ opac => 1 }); is( $notes->[0]->{marcnote}, 'Note1', 'First note' ); is( $notes->[1]->{marcnote}, 'Note2', 'Second note' ); is( $notes->[2]->{marcnote}, 'http://someserver.com', 'URL separated' ); @@ -732,6 +732,7 @@ subtest 'get_marc_notes() UNIMARC tests' => sub { $schema->storage->txn_begin; t::lib::Mocks::mock_preference( 'NotesToHide', '310' ); + t::lib::Mocks::mock_preference( 'marcflavour', 'UNIMARC' ); my $biblio = $builder->build_sample_biblio; my $record = $biblio->metadata->record; @@ -747,6 +748,7 @@ subtest 'get_marc_notes() UNIMARC tests' => sub { is( $notes->[1]->{marcnote}, 'Note2', 'Second note' ); is( @$notes, 2, 'No more notes' ); + t::lib::Mocks::mock_preference( 'marcflavour', 'MARC21' ); $schema->storage->txn_rollback; }; -- 2.34.0