Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 29871: Remove marcflavour param in Koha::Biblio->get_marc_notes

Browse source 
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

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Fridolin Somers 2022-01-12 21:05:29 -10:00 committed by Tomas Cohen Arazi
parent 5f92146588
commit b74ce12b85
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
6 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Koha/Biblio.pm
View file

@ -913,7 +913,7 @@ sub cover_images {
=head3 get_marc_notes =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. Get all notes from the MARC record and returns them in an array.
The notes are stored in different fields depending on MARC flavour. The notes are stored in different fields depending on MARC flavour.
@ -924,7 +924,7 @@ MARC21 5XX $u subfields receive special attention as they are URIs.
sub get_marc_notes { sub get_marc_notes {
my ( $self, $params ) = @_; my ( $self, $params ) = @_;
my $marcflavour = $params->{marcflavour}; my $marcflavour = C4::Context->preference('marcflavour');
my $opac = $params->{opac}; my $opac = $params->{opac};
my $scope = $marcflavour eq "UNIMARC"? '3..': '5..'; my $scope = $marcflavour eq "UNIMARC"? '3..': '5..';

2
basket/basket.pl
View file

@ -68,7 +68,7 @@ foreach my $biblionumber ( @bibs ) {
my $biblio = Koha::Biblios->find( $biblionumber ) or next; my $biblio = Koha::Biblios->find( $biblionumber ) or next;
my $dat = $biblio->unblessed; my $dat = $biblio->unblessed;
my $record = &GetMarcBiblio({ biblionumber => $biblionumber }); 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 $marcauthorsarray = $biblio->get_marc_authors;
my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
my $marcseriesarray = GetMarcSeries ($record,$marcflavour); my $marcseriesarray = GetMarcSeries ($record,$marcflavour);

2
catalogue/detail.pl
View file

@ -464,7 +464,7 @@ $template->param(
); );
$template->param( $template->param(
MARCNOTES => $marc_record ? $biblio->get_marc_notes({ marcflavour => $marcflavour }) : undef, MARCNOTES => $marc_record ? $biblio->get_marc_notes() : undef,
itemdata_ccode => $itemfields{ccode}, itemdata_ccode => $itemfields{ccode},
itemdata_enumchron => $itemfields{enumchron}, itemdata_enumchron => $itemfields{enumchron},
itemdata_uri => $itemfields{uri}, itemdata_uri => $itemfields{uri},

2
opac/opac-basket.pl
View file

@ -90,7 +90,7 @@ foreach my $biblionumber ( @bibs ) {
}); });
$record_processor->process($record); $record_processor->process($record);
next unless $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 $marcauthorsarray = $biblio->get_marc_authors;
my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour ); my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
my $marcseriesarray = GetMarcSeries ($record,$marcflavour); my $marcseriesarray = GetMarcSeries ($record,$marcflavour);

2
opac/opac-detail.pl
View file

@ -796,7 +796,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') ) { if( C4::Context->preference('ArticleRequests') ) {
my $patron = $borrowernumber ? Koha::Patrons->find($borrowernumber) : undef; my $patron = $borrowernumber ? Koha::Patrons->find($borrowernumber) : undef;

6
t/db_dependent/Koha/Biblio.t
View file

@ -699,7 +699,7 @@ subtest 'get_marc_notes() MARC21 tests' => sub {
C4::Biblio::ModBiblio( $record, $biblio->biblionumber ); C4::Biblio::ModBiblio( $record, $biblio->biblionumber );
$biblio = Koha::Biblios->find( $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->[0]->{marcnote}, 'Note1', 'First note' );
is( $notes->[1]->{marcnote}, 'Note2', 'Second note' ); is( $notes->[1]->{marcnote}, 'Note2', 'Second note' );
is( $notes->[2]->{marcnote}, 'http://someserver.com', 'URL separated' ); is( $notes->[2]->{marcnote}, 'http://someserver.com', 'URL separated' );
@ -707,7 +707,7 @@ subtest 'get_marc_notes() MARC21 tests' => sub {
is( $notes->[4]->{marcnote}, 'Note5', 'Fifth note' ); 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->[5]->{marcnote}, 'Description should show', 'Authorised value is correctly parsed to show description rather than code' );
is( @$notes, 6, 'No more notes' ); 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->[0]->{marcnote}, 'Note1', 'First note' );
is( $notes->[1]->{marcnote}, 'Note2', 'Second note' ); is( $notes->[1]->{marcnote}, 'Note2', 'Second note' );
is( $notes->[2]->{marcnote}, 'http://someserver.com', 'URL separated' ); is( $notes->[2]->{marcnote}, 'http://someserver.com', 'URL separated' );
@ -729,6 +729,7 @@ subtest 'get_marc_notes() UNIMARC tests' => sub {
$schema->storage->txn_begin; $schema->storage->txn_begin;
t::lib::Mocks::mock_preference( 'NotesToHide', '310' ); t::lib::Mocks::mock_preference( 'NotesToHide', '310' );
t::lib::Mocks::mock_preference( 'marcflavour', 'UNIMARC' );
my $biblio = $builder->build_sample_biblio; my $biblio = $builder->build_sample_biblio;
my $record = $biblio->metadata->record; my $record = $biblio->metadata->record;
@ -744,6 +745,7 @@ subtest 'get_marc_notes() UNIMARC tests' => sub {
is( $notes->[1]->{marcnote}, 'Note2', 'Second note' ); is( $notes->[1]->{marcnote}, 'Note2', 'Second note' );
is( @$notes, 2, 'No more notes' ); is( @$notes, 2, 'No more notes' );
t::lib::Mocks::mock_preference( 'marcflavour', 'MARC21' );
$schema->storage->txn_rollback; $schema->storage->txn_rollback;
}; };