From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 26 Aug 2016 12:32:00 +0000 (+0100)
Subject: Bug 17201: (bug 16431 follow-up) Remove occurrence of marcfromkohafield
X-Git-Tag: v16.11.00~866
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;ds=sidebyside;h=b043eac50c024e9e2f5a79f6a0dc92d78a82efc8;p=koha-ffzg.git

Bug 17201: (bug 16431 follow-up) Remove occurrence of marcfromkohafield

I am not sure this code is called so I don't know how to test it.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---

diff --git a/Koha/MetadataRecord.pm b/Koha/MetadataRecord.pm
index 1b2f4aa2f6..9899e164c7 100644
--- a/Koha/MetadataRecord.pm
+++ b/Koha/MetadataRecord.pm
@@ -35,6 +35,7 @@ and authority) records in Koha.
 use Modern::Perl;
 
 use Carp;
+use C4::Biblio;
 use Koha::Util::MARC;
 
 use base qw(Class::Accessor);
@@ -112,12 +113,13 @@ sub getKohaField {
     my ($self, $kohafield) = @_;
 
     if ($self->schema =~ m/marc/) {
-        my $relations = C4::Context->marcfromkohafield->{''};
-        my $tagfield = $relations->{$kohafield};
+        my $frameworkcode = ""; # FIXME Why do we use the default framework?
+        my $mss = C4::Biblio::GetMarcSubfieldStructure( $frameworkcode );
+        my $tagfield = $mss->{$kohafield};
 
-        return '' if ref($tagfield) ne 'ARRAY';
+        return '' if ref($tagfield) ne 'HASH';
 
-        my ($tag, $subfield) = @$tagfield;
+        my ($tag, $subfield) = ( $tagfield->{tagfield}, $tagfield->{tagsubfield} );
         my @kohafield;
         foreach my $field ( $self->record->field($tag) ) {
             if ( $field->tag() < 10 ) {