Bug 18014: Add test to AuthoritiesMarc.t to expose problem in AddAuthority

[srvgit] / Koha / Authority.pm

diff --git a/Koha/Authority.pm b/Koha/Authority.pm
index b07db92..b533fd7 100644 (file)
--- a/Koha/Authority.pm
+++ b/Koha/Authority.pm
@@ -1,12 +1,12 @@
 package Koha::Authority;
 
-# Copyright 2012 C & P Bibliography Services
+# Copyright 2015 Koha Development Team
 #
 # 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 2 of the License, or (at your option) any later
+# 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
@@ -17,76 +17,32 @@ package Koha::Authority;
 # with Koha; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-=head1 NAME
-
-Koha::Authority - class to encapsulate authority records in Koha
-
-=head1 SYNOPSIS
-
-Object-oriented class that encapsulates authority records in Koha.
+use Modern::Perl;
 
-=head1 DESCRIPTION
+use Carp;
 
-Authority data.
-
-=cut
-
-use strict;
-use warnings;
+use Koha::Database;
 use C4::Context;
 use MARC::Record;
-use MARC::File::XML;
-use C4::Charset;
 
-use base qw(Class::Accessor);
+use base qw(Koha::Object);
 
-__PACKAGE__->mk_accessors(qw( authid authtype record marcflavour ));
+=head1 NAME
 
-=head2 new
+Koha::Authority - Koha Authority Object class
 
-    my $auth = Koha::Authority->new($record);
+=head1 API
 
-Create a new Koha::Authority object based on the provided record.
+=head2 Class Methods
 
 =cut
-sub new {
-    my $class = shift;
-    my $record = shift;
 
-    my $self = $class->SUPER::new( { record => $record });
-
-    bless $self, $class;
-    return $self;
-}
-
-=head2 get_from_authid
-
-    my $auth = Koha::Authority->get_from_authid($authid);
-
-Create the Koha::Authority object associated with the provided authid.
+=head3 type
 
 =cut
-sub get_from_authid {
-    my $class = shift;
-    my $authid = shift;
-    my $marcflavour = C4::Context->preference("marcflavour");
-
-    my $dbh=C4::Context->dbh;
-    my $sth=$dbh->prepare("select authtypecode, marcxml from auth_header where authid=?");
-    $sth->execute($authid);
-    my ($authtypecode, $marcxml) = $sth->fetchrow;
-    my $record=eval {MARC::Record->new_from_xml(StripNonXmlChars($marcxml),'UTF-8',
-        (C4::Context->preference("marcflavour") eq "UNIMARC"?"UNIMARCAUTH":C4::Context->preference("marcflavour")))};
-    return if ($@);
-    $record->encoding('UTF-8');
-
-    my $self = $class->SUPER::new( { authid => $authid,
-                                     marcflavour => $marcflavour,
-                                     authtype => $authtypecode,
-                                     record => $record });
 
-    bless $self, $class;
-    return $self;
+sub _type {
+    return 'AuthHeader';
 }
 
 1;