@@ -, +, @@ --- C4/Biblio.pm | 3 +-- C4/Items.pm | 4 +--- Koha/EDI.pm | 3 +-- t/db_dependent/Suggestions.t | 12 ++++++------ 4 files changed, 9 insertions(+), 13 deletions(-) --- a/C4/Biblio.pm +++ a/C4/Biblio.pm @@ -2214,8 +2214,7 @@ sub TransformHtmlToMarc { my $record = MARC::Record->new(); my @fields; my ($biblionumbertagfield, $biblionumbertagsubfield) = (-1, -1); - ($biblionumbertagfield, $biblionumbertagsubfield) = - &GetMarcFromKohaField( "biblio.biblionumber", '' ) if $isbiblio; + ( $biblionumbertagfield, $biblionumbertagsubfield ) = &GetMarcFromKohaField("biblio.biblionumber") if $isbiblio; #FIXME This code assumes that the CGI params will be in the same order as the fields in the template; this is no absolute guarantee! for (my $i = 0; $params[$i]; $i++ ) { # browse all CGI params my $param = $params[$i]; --- a/C4/Items.pm +++ a/C4/Items.pm @@ -778,9 +778,7 @@ sub Item2Marc { }; my $framework = C4::Biblio::GetFrameworkCode( $biblionumber ); my $itemmarc = C4::Biblio::TransformKohaToMarc( $mungeditem, { framework => $framework } ); - my ( $itemtag, $itemsubfield ) = C4::Biblio::GetMarcFromKohaField( - "items.itemnumber", $framework, - ); + my ( $itemtag, $itemsubfield ) = C4::Biblio::GetMarcFromKohaField('items.itemnumber'); my $unlinked_item_subfields = _parse_unlinked_item_subfields_from_xml($mungeditem->{'items.more_subfields_xml'}); if (defined $unlinked_item_subfields and $#$unlinked_item_subfields > -1) { --- a/Koha/EDI.pm +++ a/Koha/EDI.pm @@ -476,8 +476,7 @@ sub receipt_items { my $order = Koha::Acquisition::Orders->find($ordernumber); $biblionumber = $order->biblionumber; my $frameworkcode = GetFrameworkCode($biblionumber); - ($itemfield) = GetMarcFromKohaField( 'items.itemnumber', - $frameworkcode ); + ($itemfield) = GetMarcFromKohaField('items.itemnumber'); } } --- a/t/db_dependent/Suggestions.t +++ a/t/db_dependent/Suggestions.t @@ -378,11 +378,11 @@ my $record = MarcRecordFromNewSuggestion($suggestion2); is("MARC::Record", ref($record), "MarcRecordFromNewSuggestion should return a MARC::Record object"); -my ($title_tag, $title_subfield) = C4::Biblio::GetMarcFromKohaField('biblio.title', ''); +my ($title_tag, $title_subfield) = C4::Biblio::GetMarcFromKohaField('biblio.title'); is($record->field( $title_tag )->subfield( $title_subfield ), "Cuisine d'automne", "Record from suggestion title should be 'Cuisine d'automne'"); -my ($author_tag, $author_subfield) = C4::Biblio::GetMarcFromKohaField('biblio.author', ''); +my ($author_tag, $author_subfield) = C4::Biblio::GetMarcFromKohaField('biblio.author'); is($record->field( $author_tag )->subfield( $author_subfield ), "Catherine", "Record from suggestion author should be 'Catherine'"); @@ -601,16 +601,16 @@ subtest 'Suggestion with ISBN' => sub { my $record = MarcRecordFromNewSuggestion( $suggestion_with_isbn ); is("MARC::Record", ref($record), "MarcRecordFromNewSuggestion should return a MARC::Record object"); - my ($isbn_tag, $isbn_subfield) = C4::Biblio::GetMarcFromKohaField('biblioitems.isbn', ''); + my ($isbn_tag, $isbn_subfield) = C4::Biblio::GetMarcFromKohaField('biblioitems.isbn'); is($record->field( $isbn_tag )->subfield( $isbn_subfield ), "1940997232", "ISBN Record from suggestion ISBN should be '1940997232'"); - my ($issn_tag, $issn_subfield) = C4::Biblio::GetMarcFromKohaField('biblioitems.issn', ''); + my ($issn_tag, $issn_subfield) = C4::Biblio::GetMarcFromKohaField('biblioitems.issn'); is($record->field( $issn_tag )->subfield( $issn_subfield ), "1940997232", "ISSN Record from suggestion ISBN should also be '1940997232'"); - my ($title_tag, $title_subfield) = C4::Biblio::GetMarcFromKohaField('biblio.title', ''); + my ($title_tag, $title_subfield) = C4::Biblio::GetMarcFromKohaField('biblio.title'); is($record->field( $title_tag), undef, "Record from suggestion title should be empty"); - my ($author_tag, $author_subfield) = C4::Biblio::GetMarcFromKohaField('biblio.author', ''); + my ($author_tag, $author_subfield) = C4::Biblio::GetMarcFromKohaField('biblio.author'); is($record->field( $author_tag), undef, "Record from suggestion author should be empty"); }; --