use MARC::File::XML;
use C4::Charset;
-use base qw(Koha::Record);
+use base qw(Koha::MetadataRecord);
-__PACKAGE__->mk_accessors(qw( authid authtype marcflavour ));
+__PACKAGE__->mk_accessors(qw( authid authtype ));
=head2 new
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=?");
$record->encoding('UTF-8');
my $self = $class->SUPER::new( { authid => $authid,
- marcflavour => $marcflavour,
authtype => $authtypecode,
+ schema => $marcflavour,
record => $record });
bless $self, $class;
--- /dev/null
+package Koha::MetadataRecord;
+
+# Copyright 2013 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 - base class for metadata records
+
+=head1 SYNOPSIS
+
+ my $record = new Koha::MetadataRecord({ 'record' => $marcrecord });
+
+=head1 DESCRIPTION
+
+Object-oriented class that encapsulates all metadata (i.e. bibliographic
+and authority) records in Koha.
+
+=cut
+
+use strict;
+use warnings;
+use C4::Context;
+use Koha::Util::MARC;
+
+use base qw(Class::Accessor);
+
+__PACKAGE__->mk_accessors(qw( record schema ));
+
+
+=head2 createMergeHash
+
+Create a hash for use when merging records. At the moment the only
+metadata schema supported is MARC.
+
+=cut
+
+sub createMergeHash {
+ my ($self, $tagslib) = @_;
+ if ($self->schema =~ m/marc/) {
+ return Koha::Util::MARC::createMergeHash($self->record, $tagslib);
+ }
+}
+
+1;
+++ /dev/null
-package Koha::Record;
-
-# Copyright 2013 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::Record - base class for MARC records
-
-=head1 SYNOPSIS
-
- my $record = new Koha::Record({ 'record' => $marcrecord });
-
-=head1 DESCRIPTION
-
-Object-oriented class that encapsulates all records in Koha.
-
-=cut
-
-use strict;
-use warnings;
-use C4::Context;
-use MARC::Record;
-
-use base qw(Class::Accessor);
-
-__PACKAGE__->mk_accessors(qw( record marcflavour ));
-
-
-=head2 createMarcHash
-
-Create a MARC hash for use when merging records.
-
-=cut
-
-sub createMarcHash {
- my ($self, $tagslib) = @_;
- my $record = $self->record;
- my @array;
- my @fields = $record->fields();
-
-
- foreach my $field (@fields) {
- my $fieldtag = $field->tag();
- if ($fieldtag < 10) {
- if (!defined($tagslib) || $tagslib->{$fieldtag}->{'@'}->{'tab'} >= 0) {
- push @array, {
- field => [
- {
- tag => $fieldtag,
- key => _createKey(),
- value => $field->data(),
- }
- ]
- };
- }
- } else {
- my @subfields = $field->subfields();
- my @subfield_array;
- foreach my $subfield (@subfields) {
- if (!defined($tagslib) || $tagslib->{$fieldtag}->{@$subfield[0]}->{'tab'} >= 0) {
- push @subfield_array, {
- subtag => @$subfield[0],
- subkey => _createKey(),
- value => @$subfield[1],
- };
- }
-
- }
-
- if ((!defined($tagslib) || $tagslib->{$fieldtag}->{'tab'} >= 0) && $fieldtag ne '995' && $fieldtag ne '999') {
- push @array, {
- field => [
- {
- tag => $fieldtag,
- key => _createKey(),
- indicator1 => $field->indicator(1),
- indicator2 => $field->indicator(2),
- subfield => [@subfield_array],
- }
- ]
- };
- }
-
- }
- }
- return [@array];
-
-}
-
-=head2 _createKey
-
-Create a random value to set it into the input name
-
-=cut
-
-sub _createKey {
- return int(rand(1000000));
-}
-
-1;
--- /dev/null
+package Koha::Util::MARC;
+
+# Copyright 2013 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.
+
+use Modern::Perl;
+use MARC::Record;
+
+=head1 NAME
+
+Koha::Util::MARC - utility class with routines for working with MARC records
+
+=head1 METHODS
+
+=head2 createMergeHash
+
+Create a hash to use when merging MARC records
+
+=cut
+
+sub createMergeHash {
+ my ( $record, $tagslib ) = @_;
+
+ return unless $record;
+
+ my @array;
+ my @fields = $record->fields();
+
+ foreach my $field (@fields) {
+ my $fieldtag = $field->tag();
+ if ( $fieldtag < 10 ) {
+ if ( !defined($tagslib)
+ || $tagslib->{$fieldtag}->{'@'}->{'tab'} >= 0 )
+ {
+ push @array,
+ {
+ field => [
+ {
+ tag => $fieldtag,
+ key => _createKey(),
+ value => $field->data(),
+ }
+ ]
+ };
+ }
+ }
+ else {
+ my @subfields = $field->subfields();
+ my @subfield_array;
+ foreach my $subfield (@subfields) {
+ if ( !defined($tagslib)
+ || $tagslib->{$fieldtag}->{ @$subfield[0] }->{'tab'} >= 0 )
+ {
+ push @subfield_array,
+ {
+ subtag => @$subfield[0],
+ subkey => _createKey(),
+ value => @$subfield[1],
+ };
+ }
+
+ }
+
+ if ( ( !defined($tagslib) || $tagslib->{$fieldtag}->{'tab'} >= 0 )
+ && @subfield_array )
+ {
+ push @array,
+ {
+ field => [
+ {
+ tag => $fieldtag,
+ key => _createKey(),
+ indicator1 => $field->indicator(1),
+ indicator2 => $field->indicator(2),
+ subfield => [@subfield_array],
+ }
+ ]
+ };
+ }
+
+ }
+ }
+ return [@array];
+}
+
+=head2 _createKey
+
+Create a random value to set it into the input name
+
+=cut
+
+sub _createKey {
+ return int(rand(1000000));
+}
+
+1;
use C4::Koha;
use C4::Reserves qw/MergeHolds/;
use C4::Acquisition qw/ModOrder GetOrdersByBiblionumber/;
-use Koha::Record;
+use Koha::MetadataRecord;
my $input = new CGI;
my @biblionumber = $input->param('biblionumber');
# Creating a loop for display
- my $recordObj1 = new Koha::Record({ 'record' => GetMarcBiblio($mergereference) });
- my $recordObj2 = new Koha::Record({ 'record' => GetMarcBiblio($notreference) });
+ my $recordObj1 = new Koha::MetadataRecord({ 'record' => GetMarcBiblio($mergereference), 'schema' => lc C4::Context->preference('marcflavour') });
+ my $recordObj2 = new Koha::MetadataRecord({ 'record' => GetMarcBiblio($notreference), 'schema' => lc C4::Context->preference('marcflavour') });
- my @record1 = $recordObj1->createMarcHash($tagslib);
- my @record2 = $recordObj2->createMarcHash($tagslib);
+ my @record1 = $recordObj1->createMergeHash($tagslib);
+ my @record2 = $recordObj2->createMergeHash($tagslib);
# Parameters
$template->param(
--- /dev/null
+#!/usr/bin/perl
+
+# Copyright 2013 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 2 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.
+
+use strict;
+use warnings;
+
+use Test::More tests => 4;
+
+BEGIN {
+ use_ok('Koha::MetadataRecord');
+}
+
+my $marcrecord = MARC::Record->new;
+
+$marcrecord->add_fields(
+ [ '001', '1234' ],
+ [ '150', ' ', ' ', a => 'Cooking' ],
+ [ '450', ' ', ' ', a => 'Cookery', z => 'Instructional manuals' ],
+ );
+my $record = Koha::MetadataRecord->new({ 'record' => $marcrecord, 'schema' => 'marc21' });
+
+is(ref($record), 'Koha::MetadataRecord', 'Created valid Koha::MetadataRecord object');
+
+my $samplehash = [
+ {
+ 'field' => [
+ {
+ 'value' => '1234',
+ 'tag' => '001',
+ }
+ ]
+ },
+ {
+ 'field' => [
+ {
+ 'subfield' => [
+ {
+ 'value' => 'Cooking',
+ 'subtag' => 'a'
+ }
+ ],
+ 'indicator2' => ' ',
+ 'tag' => 150,
+ 'indicator1' => ' ',
+ }
+ ]
+ },
+ {
+ 'field' => [
+ {
+ 'subfield' => [
+ {
+ 'value' => 'Cookery',
+ 'subtag' => 'a'
+ },
+ {
+ 'value' => 'Instructional manuals',
+ 'subtag' => 'z'
+ }
+ ],
+ 'indicator2' => ' ',
+ 'tag' => 450,
+ 'indicator1' => ' ',
+ }
+ ]
+ }
+];
+
+my $hash = $record->createMergeHash();
+my %fieldkeys;
+foreach my $field (@$hash) {
+ $fieldkeys{delete $field->{'field'}->[0]->{'key'}}++;
+ if (defined $field->{'field'}->[0]->{'subfield'}) {
+ foreach my $subfield (@{$field->{'field'}->[0]->{'subfield'}}) {
+ $fieldkeys{delete $subfield->{'subkey'}}++;
+ }
+ }
+}
+
+is_deeply($hash, $samplehash, 'Generated hash correctly');
+my $dupkeys = grep { $_ > 1 } values %fieldkeys;
+is($dupkeys, 0, 'No duplicate keys');
+++ /dev/null
-#!/usr/bin/perl
-
-# Copyright 2013 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 2 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.
-
-use strict;
-use warnings;
-
-use Test::More tests => 4;
-
-BEGIN {
- use_ok('Koha::Record');
-}
-
-my $marcrecord = MARC::Record->new;
-
-$marcrecord->add_fields(
- [ '001', '1234' ],
- [ '150', ' ', ' ', a => 'Cooking' ],
- [ '450', ' ', ' ', a => 'Cookery', z => 'Instructional manuals' ],
- );
-my $record = Koha::Record->new({ 'record' => $marcrecord });
-
-is(ref($record), 'Koha::Record', 'Created valid Koha::Record object');
-
-my $samplehash = [
- {
- 'field' => [
- {
- 'value' => '1234',
- 'tag' => '001',
- }
- ]
- },
- {
- 'field' => [
- {
- 'subfield' => [
- {
- 'value' => 'Cooking',
- 'subtag' => 'a'
- }
- ],
- 'indicator2' => ' ',
- 'tag' => 150,
- 'indicator1' => ' ',
- }
- ]
- },
- {
- 'field' => [
- {
- 'subfield' => [
- {
- 'value' => 'Cookery',
- 'subtag' => 'a'
- },
- {
- 'value' => 'Instructional manuals',
- 'subtag' => 'z'
- }
- ],
- 'indicator2' => ' ',
- 'tag' => 450,
- 'indicator1' => ' ',
- }
- ]
- }
-];
-
-my $hash = $record->createMarcHash();
-my %fieldkeys;
-require Data::Dumper;
-foreach my $field (@$hash) {
- $fieldkeys{delete $field->{'field'}->[0]->{'key'}}++;
- if (defined $field->{'field'}->[0]->{'subfield'}) {
- foreach my $subfield (@{$field->{'field'}->[0]->{'subfield'}}) {
- $fieldkeys{delete $subfield->{'subkey'}}++;
- }
- }
-}
-
-is_deeply($hash, $samplehash, 'Generated hash correctly');
-my $dupkeys = grep { $_ > 1 } values %fieldkeys;
-is($dupkeys, 0, 'No duplicate keys');
--- /dev/null
+#!/usr/bin/perl
+
+# Copyright 2013 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 2 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.
+
+# Note that at present this test is almost identical to the one testing
+# the encapsulating method in Koha::MetadataRecord.
+
+use strict;
+use warnings;
+
+use Test::More tests => 3;
+
+BEGIN {
+ use_ok('Koha::Util::MARC');
+}
+
+my $marcrecord = MARC::Record->new;
+
+$marcrecord->add_fields(
+ [ '001', '1234' ],
+ [ '150', ' ', ' ', a => 'Cooking' ],
+ [ '450', ' ', ' ', a => 'Cookery', z => 'Instructional manuals' ],
+ );
+my $samplehash = [
+ {
+ 'field' => [
+ {
+ 'value' => '1234',
+ 'tag' => '001',
+ }
+ ]
+ },
+ {
+ 'field' => [
+ {
+ 'subfield' => [
+ {
+ 'value' => 'Cooking',
+ 'subtag' => 'a'
+ }
+ ],
+ 'indicator2' => ' ',
+ 'tag' => 150,
+ 'indicator1' => ' ',
+ }
+ ]
+ },
+ {
+ 'field' => [
+ {
+ 'subfield' => [
+ {
+ 'value' => 'Cookery',
+ 'subtag' => 'a'
+ },
+ {
+ 'value' => 'Instructional manuals',
+ 'subtag' => 'z'
+ }
+ ],
+ 'indicator2' => ' ',
+ 'tag' => 450,
+ 'indicator1' => ' ',
+ }
+ ]
+ }
+];
+
+my $hash = Koha::Util::MARC::createMergeHash($marcrecord);
+my %fieldkeys;
+foreach my $field (@$hash) {
+ $fieldkeys{delete $field->{'field'}->[0]->{'key'}}++;
+ if (defined $field->{'field'}->[0]->{'subfield'}) {
+ foreach my $subfield (@{$field->{'field'}->[0]->{'subfield'}}) {
+ $fieldkeys{delete $subfield->{'subkey'}}++;
+ }
+ }
+}
+
+is_deeply($hash, $samplehash, 'Generated hash correctly');
+my $dupkeys = grep { $_ > 1 } values %fieldkeys;
+is($dupkeys, 0, 'No duplicate keys');
projects / koha_fer / commitdiff