Bug 32336: (QA follow-up) Use $metadata->schema

[srvgit] / Koha / MetadataRecord.pm

diff --git a/Koha/MetadataRecord.pm b/Koha/MetadataRecord.pm
index 1577cd0..6f0aa1f 100644 (file)
--- a/Koha/MetadataRecord.pm
+++ b/Koha/MetadataRecord.pm
@@ -4,18 +4,18 @@ package Koha::MetadataRecord;
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 =head1 NAME
 
@@ -34,7 +34,7 @@ and authority) records in Koha.
 
 use Modern::Perl;
 
-use Carp;
+use Carp qw( carp );
 use Koha::Util::MARC;
 
 use base qw(Class::Accessor);
@@ -87,17 +87,8 @@ sub new {
         return;
     }
 
-    my $record = $params->{ record };
-    my $schema = $params->{ schema };
-    my $format = $params->{ format } // 'MARC';
-    my $id     = $params->{ id };
-
-    my $self = $class->SUPER::new({
-        record => $record,
-        schema => $schema,
-        format => $format,
-        id     => $id
-    });
+    $params->{format} //= 'MARC';
+    my $self = $class->SUPER::new($params);
 
     bless $self, $class;
     return $self;
@@ -117,29 +108,4 @@ sub createMergeHash {
     }
 }
 
-sub getKohaField {
-    my ($self, $kohafield) = @_;
-
-    if ($self->schema =~ m/marc/) {
-        my $relations = C4::Context->marcfromkohafield->{''};
-        my $tagfield = $relations->{$kohafield};
-
-        return '' if ref($tagfield) ne 'ARRAY';
-
-        my ($tag, $subfield) = @$tagfield;
-        my @kohafield;
-        foreach my $field ( $self->record->field($tag) ) {
-            if ( $field->tag() < 10 ) {
-                push @kohafield, $field->data();
-            } else {
-                foreach my $contents ( $field->subfield($subfield) ) {
-                    push @kohafield, $contents;
-                }
-            }
-        }
-
-        return join ' | ', @kohafield;
-    }
-}
-
 1;