use C4::AuthoritiesMarc::UNIMARC;
use C4::Charset;
use C4::Log;
-use Koha::Authority;
+use Koha::MetadataRecord::Authority;
use vars qw($VERSION @ISA @EXPORT);
sub GetAuthority {
my ($authid)=@_;
- my $authority = Koha::Authority->get_from_authid($authid);
+ my $authority = Koha::MetadataRecord::Authority->get_from_authid($authid);
return unless $authority;
return ($authority->record);
}
+++ /dev/null
-package Koha::Authority;
-
-# Copyright 2012 C & P Bibliography Services
-#
-# 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 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.
-
-=head1 NAME
-
-Koha::Authority - class to encapsulate authority records in Koha
-
-=head1 SYNOPSIS
-
-Object-oriented class that encapsulates authority records in Koha.
-
-=head1 DESCRIPTION
-
-Authority data.
-
-=cut
-
-use strict;
-use warnings;
-use C4::Context;
-use MARC::Record;
-use MARC::File::XML;
-use C4::Charset;
-use Koha::Util::MARC;
-
-use base qw(Koha::MetadataRecord);
-
-__PACKAGE__->mk_accessors(qw( authid authtype ));
-
-=head2 new
-
- my $auth = Koha::Authority->new($record);
-
-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,
- '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 = lc 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');
-
- # 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,
- 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;
sub _get_authority_for_export {
my ($params) = @_;
my $authid = $params->{authid} || return;
- my $authority = Koha::Authority->get_from_authid($authid);
+ my $authority = Koha::MetadataRecord::Authority->get_from_authid($authid);
return unless $authority;
return $authority->record;
}
use strict;
use warnings;
use Carp;
-use Koha::Authority;
+use Koha::MetadataRecord::Authority;
use C4::Biblio qw/GetMarcFromKohaField/;
use base qw(Koha::RecordProcessor::Base);
next unless $authid;
- my $authority = Koha::Authority->get_from_authid($authid);
+ my $authority = Koha::MetadataRecord::Authority->get_from_authid($authid);
next unless $authority;
my $auth_marc = $authority->record;
my @seefrom = $auth_marc->field('4..');
--- /dev/null
+package Koha::MetadataRecord::Authority;
+
+# Copyright 2012 C & P Bibliography Services
+#
+# 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 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.
+
+=head1 NAME
+
+Koha::MetadataRecord::Authority - class to encapsulate authority records in Koha
+
+=head1 SYNOPSIS
+
+Object-oriented class that encapsulates authority records in Koha.
+
+=head1 DESCRIPTION
+
+Authority data.
+
+=cut
+
+use strict;
+use warnings;
+use C4::Context;
+use MARC::Record;
+use MARC::File::XML;
+use C4::Charset;
+use Koha::Util::MARC;
+
+use base qw(Koha::MetadataRecord);
+
+__PACKAGE__->mk_accessors(qw( authid authtype ));
+
+=head2 new
+
+ my $auth = Koha::MetadataRecord::Authority->new($record);
+
+Create a new Koha::MetadataRecord::Authority object based on the provided record.
+
+=cut
+
+sub new {
+ my $class = shift;
+ my $record = shift;
+
+ 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::MetadataRecord::Authority->get_from_authid($authid);
+
+Create the Koha::MetadataRecord::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 = lc 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');
+
+ # NOTE: GuessAuthTypeCode has no business in Koha::MetadataRecord::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,
+ authtype => $authtypecode,
+ schema => $marcflavour,
+ record => $record });
+
+ bless $self, $class;
+ return $self;
+}
+
+=head2 get_from_breeding
+
+ my $auth = Koha::MetadataRecord::Authority->get_from_authid($authid);
+
+Create the Koha::MetadataRecord::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::MetadataRecord::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;
use C4::Output;
use C4::Auth;
use C4::AuthoritiesMarc;
-use Koha::Authority;
+use Koha::MetadataRecord::Authority;
use C4::Koha;
use C4::Biblio;
push @errors, { code => "WRONG_COUNT", value => scalar(@authid) };
}
else {
- my $recordObj1 = Koha::Authority->get_from_authid($authid[0]) || Koha::Authority->new();
+ my $recordObj1 = Koha::MetadataRecord::Authority->get_from_authid($authid[0]) || Koha::MetadataRecord::Authority->new();
my $recordObj2;
if (defined $mergereference && $mergereference eq 'breeding') {
- $recordObj2 = Koha::Authority->get_from_breeding($authid[1]) || Koha::Authority->new();
+ $recordObj2 = Koha::MetadataRecord::Authority->get_from_breeding($authid[1]) || Koha::MetadataRecord::Authority->new();
} else {
- $recordObj2 = Koha::Authority->get_from_authid($authid[1]) || Koha::Authority->new();
+ $recordObj2 = Koha::MetadataRecord::Authority->get_from_authid($authid[1]) || Koha::MetadataRecord::Authority->new();
}
if ($mergereference) {
: (),
( $authtype ? ( authtypecode => $authtype ) : () ),
};
- # Koha::Authority is not a Koha::Object...
+ # Koha::MetadataRecord::Authority is not a Koha::Object...
my $authorities = Koha::Database->new->schema->resultset('AuthHeader')->search( $conditions );
@record_ids = map { $_->authid } $authorities->all;
}
use C4::Biblio qw( GetMarcBiblio );
use C4::MarcModificationTemplates qw( ModifyRecordWithTemplate );
use C4::Output qw( output_html_with_http_headers );
-use Koha::Authority;
+use Koha::MetadataRecord::Authority;
my $query = CGI->new();
my $record_id = $query->param('record_id');
if ( $record_type eq 'biblio' ) {
$record = GetMarcBiblio( $record_id );
} else {
- my $authority = Koha::Authority->get_from_authid( $record_id );
+ my $authority = Koha::MetadataRecord::Authority->get_from_authid( $record_id );
$record = $authority->record;
}
use Test::More;
BEGIN {
- use_ok('Koha::Authority');
+ use_ok('Koha::MetadataRecord::Authority');
}
my $record = MARC::Record->new;
[ '150', ' ', ' ', a => 'Cooking' ],
[ '450', ' ', ' ', a => 'Cookery' ],
);
-my $authority = Koha::Authority->new($record);
+my $authority = Koha::MetadataRecord::Authority->new($record);
-is(ref($authority), 'Koha::Authority', 'Created valid Koha::Authority object');
+is(ref($authority), 'Koha::MetadataRecord::Authority', 'Created valid Koha::MetadataRecord::Authority object');
is($authority->authorized_heading(), 'Cooking', 'Authorized heading was correct');
$authid = $row->{'authid'};
}
skip 'No authorities', 3 unless $authid;
- $authority = Koha::Authority->get_from_authid($authid);
+ $authority = Koha::MetadataRecord::Authority->get_from_authid($authid);
- is(ref($authority), 'Koha::Authority', 'Retrieved valid Koha::Authority object');
+ is(ref($authority), 'Koha::MetadataRecord::Authority', 'Retrieved valid Koha::MetadataRecord::Authority object');
is($authority->authid, $authid, 'Object authid is correct');
is($authority->record->field('001')->data(), $authid, 'Retrieved correct record');
- $authority = Koha::Authority->get_from_authid('alphabetsoup');
+ $authority = Koha::MetadataRecord::Authority->get_from_authid('alphabetsoup');
is($authority, undef, 'No invalid record is retrieved');
}
}
skip 'No authorities in reservoir', 3 unless $import_record_id;
- $authority = Koha::Authority->get_from_breeding($import_record_id);
+ $authority = Koha::MetadataRecord::Authority->get_from_breeding($import_record_id);
- is(ref($authority), 'Koha::Authority', 'Retrieved valid Koha::Authority object');
+ is(ref($authority), 'Koha::MetadataRecord::Authority', 'Retrieved valid Koha::MetadataRecord::Authority object');
is($authority->authid, undef, 'Records in reservoir do not have an authid');
is(ref($authority->record), 'MARC::Record', 'MARC record attached to authority');
- $authority = Koha::Authority->get_from_breeding('alphabetsoup');
+ $authority = Koha::MetadataRecord::Authority->get_from_breeding('alphabetsoup');
is($authority, undef, 'No invalid record is retrieved from reservoir');
}
use warnings;
use File::Spec;
use MARC::Record;
-use Koha::Authority;
+use Koha::MetadataRecord::Authority;
use Test::More;
use Test::MockModule;
);
- my $koha_authority = new Test::MockModule('Koha::Authority');
+ my $koha_authority = new Test::MockModule('Koha::MetadataRecord::Authority');
$koha_authority->mock( 'get_from_authid', sub {
my $auth_record = MARC::Record->new;
use C4::BackgroundJob;
use C4::Biblio qw( GetMarcBiblio ModBiblio );
use C4::MarcModificationTemplates qw( GetModificationTemplateActions GetModificationTemplates ModifyRecordWithTemplate );
-use Koha::Authority;
+use Koha::MetadataRecord::Authority;
my $input = new CGI;
our $dbh = C4::Context->dbh;
push @records, $biblio;
} else {
# Retrieve authority information
- my $authority = Koha::Authority->get_from_authid( $record_id );
+ my $authority = Koha::MetadataRecord::Authority->get_from_authid( $record_id );
unless ( $authority ) {
push @messages, {
type => 'warning',
# Authorities
my $authid = $record_id;
my $error = eval {
- my $authority = Koha::Authority->get_from_authid( $authid );
+ my $authority = Koha::MetadataRecord::Authority->get_from_authid( $authid );
my $record = $authority->record;
ModifyRecordWithTemplate( $mmtid, $record );
ModAuthority( $authid, $record, GetAuthTypeCode( $authid ) );
: (),
( $authtype ? ( authtypecode => $authtype ) : () ),
};
- # Koha::Authority is not a Koha::Object...
+ # Koha::MetadataRecord::Authority is not a Koha::Object...
my $authorities = Koha::Database->new->schema->resultset('AuthHeader')->search( $conditions );
@record_ids = map { $_->authid } $authorities->all;
}
projects / koha.git / commitdiff