X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=Koha%2FAuthority.pm;h=7097bd99887265e473c2173c37b8ef4982a2ac30;hb=568f32606c2c9c247b2b477193a2d6814f738fa6;hp=b07db92895f96e813020ca9b019177ecd097e370;hpb=8a53d284907bbbe9d3ee2552e964af9f5dfbd0ac;p=koha.git

diff --git a/Koha/Authority.pm b/Koha/Authority.pm
index b07db92895..7097bd9988 100644
--- a/Koha/Authority.pm
+++ b/Koha/Authority.pm
@@ -6,7 +6,7 @@ package Koha::Authority;
 #
 # 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
@@ -37,10 +37,11 @@ use C4::Context;
 use MARC::Record;
 use MARC::File::XML;
 use C4::Charset;
+use Koha::Util::MARC;
 
-use base qw(Class::Accessor);
+use base qw(Koha::MetadataRecord);
 
-__PACKAGE__->mk_accessors(qw( authid authtype record marcflavour ));
+__PACKAGE__->mk_accessors(qw( authid authtype ));
 
 =head2 new
 
@@ -49,27 +50,38 @@ __PACKAGE__->mk_accessors(qw( authid authtype record marcflavour ));
 Create a new Koha::Authority object based on the provided record.
 
 =cut
+
 sub new {
     my $class = shift;
     my $record = shift;
 
-    my $self = $class->SUPER::new( { record => $record });
+    my $self = $class->SUPER::new(
+        {
+            'record' => $record,
+            'schema' => lc C4::Context->preference("marcflavour")
+        }
+    );
 
     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.
+Note that this routine currently retrieves a MARC record because
+authorities in Koha are MARC records by definition. This is an
+unfortunate but unavoidable fact.
 
 =cut
+
 sub get_from_authid {
     my $class = shift;
     my $authid = shift;
-    my $marcflavour = C4::Context->preference("marcflavour");
+    my $marcflavour = lc C4::Context->preference("marcflavour");
 
     my $dbh=C4::Context->dbh;
     my $sth=$dbh->prepare("select authtypecode, marcxml from auth_header where authid=?");
@@ -80,13 +92,66 @@ sub get_from_authid {
     return if ($@);
     $record->encoding('UTF-8');
 
+    # NOTE: GuessAuthTypeCode has no business in Koha::Authority, which is an
+    #       object-oriented class. Eventually perhaps there will be utility
+    #       classes in the Koha:: namespace, but there are not at the moment,
+    #       so this shim seems like the best option all-around.
+    require C4::AuthoritiesMarc;
+    $authtypecode ||= C4::AuthoritiesMarc::GuessAuthTypeCode($record);
+
     my $self = $class->SUPER::new( { authid => $authid,
-                                     marcflavour => $marcflavour,
                                      authtype => $authtypecode,
+                                     schema => $marcflavour,
                                      record => $record });
 
     bless $self, $class;
     return $self;
 }
 
+=head2 get_from_breeding
+
+    my $auth = Koha::Authority->get_from_authid($authid);
+
+Create the Koha::Authority object associated with the provided authid.
+
+=cut
+
+sub get_from_breeding {
+    my $class = shift;
+    my $import_record_id = shift;
+    my $marcflavour = lc C4::Context->preference("marcflavour");
+
+    my $dbh=C4::Context->dbh;
+    my $sth=$dbh->prepare("select marcxml from import_records where import_record_id=? and record_type='auth';");
+    $sth->execute($import_record_id);
+    my $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');
+
+    # NOTE: GuessAuthTypeCode has no business in Koha::Authority, which is an
+    #       object-oriented class. Eventually perhaps there will be utility
+    #       classes in the Koha:: namespace, but there are not at the moment,
+    #       so this shim seems like the best option all-around.
+    require C4::AuthoritiesMarc;
+    my $authtypecode = C4::AuthoritiesMarc::GuessAuthTypeCode($record);
+
+    my $self = $class->SUPER::new( {
+                                     schema => $marcflavour,
+                                     authtype => $authtypecode,
+                                     record => $record });
+
+    bless $self, $class;
+    return $self;
+}
+
+sub authorized_heading {
+    my ($self) = @_;
+    if ($self->schema =~ m/marc/) {
+        return Koha::Util::MARC::getAuthorityAuthorizedHeading($self->record, $self->schema);
+    }
+    return;
+}
+
 1;