Attachment #99528 for bug #21958

View | Details | Raw Unified | Return to bug 21958
Collapse All | Expand All

Lines 1-6 Link Here

(-)a/C4/AuthoritiesMarc.pm (-57 / +64 lines)
1	package C4::AuthoritiesMarc;	1	package C4::AuthoritiesMarc;
2		2
3	# Copyright 2000-2002 Katipo Communications	3	# Copyright 2000-2002 Katipo Communications
		4	# Copyright 2018 The National Library of Finland, University of Helsinki
4	#	5	#
5	# This file is part of Koha.	6	# This file is part of Koha.
6	#	7	#
Lines 359-368 sub GuessAuthTypeCode { Link Here
359	'110'=>{authtypecode=>'CORPO_NAME'},	360	'110'=>{authtypecode=>'CORPO_NAME'},
360	'111'=>{authtypecode=>'MEETI_NAME'},	361	'111'=>{authtypecode=>'MEETI_NAME'},
361	'130'=>{authtypecode=>'UNIF_TITLE'},	362	'130'=>{authtypecode=>'UNIF_TITLE'},
		363	'147'=>{authtypecode=>'NAME_EVENT'},
362	'148'=>{authtypecode=>'CHRON_TERM'},	364	'148'=>{authtypecode=>'CHRON_TERM'},
363	'150'=>{authtypecode=>'TOPIC_TERM'},	365	'150'=>{authtypecode=>'TOPIC_TERM'},
364	'151'=>{authtypecode=>'GEOGR_NAME'},	366	'151'=>{authtypecode=>'GEOGR_NAME'},
365	'155'=>{authtypecode=>'GENRE/FORM'},	367	'155'=>{authtypecode=>'GENRE/FORM'},
		368	'162'=>{authtypecode=>'MED_PERFRM'},
366	'180'=>{authtypecode=>'GEN_SUBDIV'},	369	'180'=>{authtypecode=>'GEN_SUBDIV'},
367	'181'=>{authtypecode=>'GEO_SUBDIV'},	370	'181'=>{authtypecode=>'GEO_SUBDIV'},
368	'182'=>{authtypecode=>'CHRON_SUBD'},	371	'182'=>{authtypecode=>'CHRON_SUBD'},
Lines 940-945 sub BuildSummary { Link Here
940	# construct MARC21 summary	943	# construct MARC21 summary
941	# FIXME - looping over 1XX is questionable	944	# FIXME - looping over 1XX is questionable
942	# since MARC21 authority should have only one 1XX	945	# since MARC21 authority should have only one 1XX
		946	use C4::Heading::MARC21;
		947	my $handler = C4::Heading::MARC21->new();
943	my $subfields_to_report;	948	my $subfields_to_report;
944	foreach my $field ($record->field('1..')) {	949	foreach my $field ($record->field('1..')) {
945	my $tag = $field->tag();	950	my $tag = $field->tag();
Lines 947-977 sub BuildSummary { Link Here
947	# FIXME - 152 is not a good tag to use	952	# FIXME - 152 is not a good tag to use
948	# in MARC21 -- purely local tags really ought to be	953	# in MARC21 -- purely local tags really ought to be
949	# 9XX	954	# 9XX
950	if ($tag eq '100') {	955
951	$subfields_to_report = 'abcdefghjklmnopqrstvxyz';	956	$subfields_to_report = $handler->get_auth_heading_subfields_to_report($tag);
952	} elsif ($tag eq '110') {	957
953	$subfields_to_report = 'abcdefghklmnoprstvxyz';
954	} elsif ($tag eq '111') {
955	$subfields_to_report = 'acdefghklnpqstvxyz';
956	} elsif ($tag eq '130') {
957	$subfields_to_report = 'adfghklmnoprstvxyz';
958	} elsif ($tag eq '148') {
959	$subfields_to_report = 'abvxyz';
960	} elsif ($tag eq '150') {
961	$subfields_to_report = 'abvxyz';
962	} elsif ($tag eq '151') {
963	$subfields_to_report = 'avxyz';
964	} elsif ($tag eq '155') {
965	$subfields_to_report = 'abvxyz';
966	} elsif ($tag eq '180') {
967	$subfields_to_report = 'vxyz';
968	} elsif ($tag eq '181') {
969	$subfields_to_report = 'vxyz';
970	} elsif ($tag eq '182') {
971	$subfields_to_report = 'vxyz';
972	} elsif ($tag eq '185') {
973	$subfields_to_report = 'vxyz';
974	}
975	if ($subfields_to_report) {	958	if ($subfields_to_report) {
976	push @authorized, {	959	push @authorized, {
977	heading => $field->as_string($subfields_to_report),	960	heading => $field->as_string($subfields_to_report),
Lines 1095-1138 sub GetAuthorizedHeading { Link Here
1095	return $field->as_string('abcdefghijlmnopqrstuvwxyz');	1078	return $field->as_string('abcdefghijlmnopqrstuvwxyz');
1096	}	1079	}
1097	} else {	1080	} else {
		1081	use C4::Heading::MARC21;
		1082	my $handler = C4::Heading::MARC21->new();
		1083
1098	foreach my $field ($record->field('1..')) {	1084	foreach my $field ($record->field('1..')) {
1099	my $tag = $field->tag();	1085	my $subfields = $handler->get_valid_bib_heading_subfields($field->tag());
1100	next if "152" eq $tag;	1086	return $field->as_string($subfields) if ($subfields);
1101	# FIXME - 152 is not a good tag to use
1102	# in MARC21 -- purely local tags really ought to be
1103	# 9XX
1104	if ($tag eq '100') {
1105	return $field->as_string('abcdefghjklmnopqrstvxyz68');
1106	} elsif ($tag eq '110') {
1107	return $field->as_string('abcdefghklmnoprstvxyz68');
1108	} elsif ($tag eq '111') {
1109	return $field->as_string('acdefghklnpqstvxyz68');
1110	} elsif ($tag eq '130') {
1111	return $field->as_string('adfghklmnoprstvxyz68');
1112	} elsif ($tag eq '148') {
1113	return $field->as_string('abvxyz68');
1114	} elsif ($tag eq '150') {
1115	return $field->as_string('abvxyz68');
1116	} elsif ($tag eq '151') {
1117	return $field->as_string('avxyz68');
1118	} elsif ($tag eq '155') {
1119	return $field->as_string('abvxyz68');
1120	} elsif ($tag eq '180') {
1121	return $field->as_string('vxyz68');
1122	} elsif ($tag eq '181') {
1123	return $field->as_string('vxyz68');
1124	} elsif ($tag eq '182') {
1125	return $field->as_string('vxyz68');
1126	} elsif ($tag eq '185') {
1127	return $field->as_string('vxyz68');
1128	} else {
1129	return $field->as_string();
1130	}
1131	}	1087	}
1132	}	1088	}
1133	return;	1089	return;
1134	}	1090	}
1135		1091
		1092	=head2 CompareFieldWithAuthority
		1093
		1094	$match = &CompareFieldWithAuthority({ field => $field, authid => $authid })
		1095
		1096	Takes a MARC::Field from a bibliographic record and an authid, and returns true if they match.
		1097
		1098	=cut
		1099
		1100	sub CompareFieldWithAuthority {
		1101	my $args = shift;
		1102
		1103	my $record = GetAuthority($args->{authid});
		1104	return unless (ref $record eq 'MARC::Record');
		1105	if (C4::Context->preference('marcflavour') eq 'UNIMARC') {
		1106	# UNIMARC has same subfields for bibs and authorities
		1107	foreach my $field ($record->field('2..')) {
		1108	return compare_fields($field, $args->{field}, 'abcdefghijlmnopqrstuvwxyz');
		1109	}
		1110	} else {
		1111	use C4::Heading::MARC21;
		1112	my $handler = C4::Heading::MARC21->new();
		1113
		1114	foreach my $field ($record->field('1..')) {
		1115	my $subfields = $handler->get_valid_bib_heading_subfields($field->tag());
		1116	return compare_fields($field, $args->{field}, $subfields) if ($subfields);
		1117	}
		1118	}
		1119	return 0;
		1120	}
		1121
1136	=head2 BuildAuthHierarchies	1122	=head2 BuildAuthHierarchies
1137		1123
1138	$text= &BuildAuthHierarchies( $authid, $force)	1124	$text= &BuildAuthHierarchies( $authid, $force)
Lines 1594-1599 sub get_auth_type_location { Link Here
1594	}	1580	}
1595	}	1581	}
1596		1582
		1583	=head2 compare_fields
		1584
		1585	my match = compare_fields($field1, $field2, 'abcde');
		1586
		1587	Compares the listed subfields of both fields and return true if they all match
		1588
		1589	=cut
		1590
		1591	sub compare_fields {
		1592	my ($field1, $field2, $subfields) = @_;
		1593
		1594	foreach my $subfield (split(//, $subfields)) {
		1595	my $subfield1 = $field1->subfield($subfield) // '';
		1596	my $subfield2 = $field2->subfield($subfield) // '';
		1597	return 0 unless $subfield1 eq $subfield2;
		1598	}
		1599	return 1;
		1600	}
		1601
		1602
1597	END { } # module clean-up code here (global destructor)	1603	END { } # module clean-up code here (global destructor)
1598		1604
1599	1;	1605	1;
Lines 1604-1609 __END__ Link Here
1604	Koha Development Team <http://koha-community.org/>	1610	Koha Development Team <http://koha-community.org/>
1605		1611
1606	Paul POULAIN paul.poulain@free.fr	1612	Paul POULAIN paul.poulain@free.fr
		1613	Ere Maijala ere.maijala@helsinki.fi
1607		1614
1608	=cut	1615	=cut
1609		1616

Lines 641-649 sub _check_valid_auth_link { Link Here

(-)a/C4/Biblio.pm (-3 / +1 lines)
641	my ( $authid, $field ) = @_;	641	my ( $authid, $field ) = @_;
642	require C4::AuthoritiesMarc;	642	require C4::AuthoritiesMarc;
643		643
644	my $authorized_heading =	644	return C4::AuthoritiesMarc::CompareFieldWithAuthority( { 'field' => $field, 'authid' => $authid } );
645	C4::AuthoritiesMarc::GetAuthorizedHeading( { 'authid' => $authid } ) \|\| '';
646	return ($field->as_string('abcdefghijklmnopqrstuvwxyz') eq $authorized_heading);
647	}	645	}
648		646
649	=head2 GetBiblioData	647	=head2 GetBiblioData

Lines 172-177 sub preferred_authorities { Link Here

(-)a/C4/Heading.pm (+2 lines)
172		172
173	if (C4::Heading::valid_heading_subfield('100', 'e', '')) ...	173	if (C4::Heading::valid_heading_subfield('100', 'e', '')) ...
174		174
		175	Check if the given subfield is valid for the given field.
		176
175	=cut	177	=cut
176		178
177	sub valid_heading_subfield {	179	sub valid_heading_subfield {




        subfields  => 'adfghklmnoprst',
        main_entry => 1
    },
    '147' => {
        auth_type => 'NAME_EVENT',
        subfields => 'acdgvxyz68',
        main_entry => 1
    },
    '148' => {
        auth_type => 'CHRON_TERM',
        subfields => 'abvxyz68',
        main_entry => 1
    },
    '150' => {
        auth_type => 'TOPIC_TERM',
        subfields => 'abvxyz68',
        main_entry => 1
    },
    '151' => {
        auth_type => 'GEOGR_NAME',
        subfields => 'avxyz68',
        main_entry => 1
    },
    '155' => {
        auth_type => 'GENRE/FORM',
        subfields => 'abvxyz68',
        main_entry => 1
    },
    '162' => {
        auth_type => 'MED_PERFRM',
        subfields => 'a68',
        main_entry => 1
    },
    '180' => {
        auth_type => 'TOPIC_TERM',
        subfields => 'vxyz68'
    },
    '181' => {
        auth_type => 'GEOGR_NAME',
        subfields => 'vxyz68'
    },
    '182' => {
        auth_type => 'CHRON_TERM',
        subfields => 'vxyz68'
    },
    '185' => {
        auth_type => 'GENRE/FORM',
        subfields => 'vxyz68'
    },
    '440' => { auth_type => 'UNIF_TITLE', subfields => 'anp', series => 1 },
    '600' => {
        auth_type => 'PERSO_NAME',

my $auth_heading_fields = {
    '100' => {
        auth_type  => 'PERSO_NAME',
        subfields  => 'abcdefghjklmnopqrstvxyz68',
        main_entry => 1
    },
    '110' => {
        auth_type  => 'CORPO_NAME',
        subfields  => 'abcdefghklmnoprstvxyz68',
        main_entry => 1
    },
    '111' => {
        auth_type  => 'MEETI_NAME',
        subfields  => 'acdefghklnpqstvxyz68',
        main_entry => 1
    },
    '130' => {
        auth_type  => 'UNIF_TITLE',
        subfields  => 'adfghklmnoprstvxyz68',
        main_entry => 1
    },
    '147' => {
        auth_type  => 'NAME_EVENT',
        subfields  => 'acdgvxyz68',
        main_entry => 1
    },
    '148' => {
        auth_type  => 'CHRON_TERM',
        subfields  => 'abvxyz68',
        main_entry => 1
    },
    '150' => {
        auth_type  => 'TOPIC_TERM',
        subfields  => 'abvxyz68',
        main_entry => 1
    },
    '151' => {
        auth_type  => 'GEOG_NAME',
        subfields  => 'avxyz68',
        main_entry => 1
    },
    '155' => {
        auth_type  => 'GENRE/FORM',
        subfields  => 'abvxyz68',
        main_entry => 1
    },
    '162' => {
        auth_type  => 'MED_PERFRM',
        subfields  => 'a68',
        main_entry => 1
    },
    '180' => {
        auth_type => 'TOPIC_TERM',
        subfields => 'vxyz68',
    },
    '181' => {
        auth_type => 'GEOGR_NAME',
        subfields => 'vxyz68',
    },
    '182' => {
        auth_type => 'CHRON_TERM',
        subfields => 'vxyz68',
    },
    '185' => {
        auth_type => 'GENRE/FORM',
        subfields => 'vxyz68',
    },
};

=head2 subdivisions

    return 0;
}

=head2 get_valid_bib_heading_subfields

=cut

sub get_valid_bib_heading_subfields {
    my $self          = shift;
    my $tag           = shift;

    return $bib_heading_fields->{$tag}->{subfields} // undef;
}

=head2 get_auth_heading_subfields_to_report

=cut

sub get_auth_heading_subfields_to_report {
    my $self          = shift;
    my $tag           = shift;

    my $subfields = $auth_heading_fields->{$tag}->{subfields} // '';
    $subfields =~ s/[68]//;
    return $subfields;
}

=head2 parse_heading

Given a field and an indicator to specify if it is an authority field or biblio field we return




		('CORPO_NAME', 'Corporate Name', '110', 'Corporate Names'),
		('MEETI_NAME', 'Meeting Name', '111', 'Meeting Name'),
		('UNIF_TITLE', 'Uniform Title', '130', 'Uniform Title'),
		('NAME_EVENT', 'Named Event', '147', 'Named Event'),
		('CHRON_TERM', 'Chronological Term', '148', 'Chronological Term'),
		('TOPIC_TERM', 'Topical Term', '150', 'Topical Term'),
		('GEOGR_NAME', 'Geographic Name', '151', 'Geographic Name'),
		('GENRE/FORM', 'Genre/Form Term', '155', 'Genre/Form Term'),
	    ('MED_PERFRM', 'Medium of Performance', '162', 'Medium of Performance');

-- ******************************************************
-- KOHA UNSUPPORTED STANDARD MARC 21 AUTHORITY TYPES.

Lines 5-13 Link Here

(-)a/t/db_dependent/AuthoritiesMarc.t (-1 / +27 lines)
5		5
6	use Modern::Perl;	6	use Modern::Perl;
7		7
8	use Test::More tests => 9;	8	use Test::More tests => 10;
9	use Test::MockModule;	9	use Test::MockModule;
10	use Test::Warn;	10	use Test::Warn;
		11	use MARC::Field;
11	use MARC::Record;	12	use MARC::Record;
12		13
13	use t::lib::Mocks;	14	use t::lib::Mocks;
Lines 54-59 $module->mock('GetAuthority', sub { Link Here
54	[ '151', ' ', ' ', a => 'New York (City)' ],	55	[ '151', ' ', ' ', a => 'New York (City)' ],
55	[ '551', ' ', ' ', a => 'New York (State)', w => 'g' ]	56	[ '551', ' ', ' ', a => 'New York (State)', w => 'g' ]
56	);	57	);
		58	} elsif ($authid eq '5') {
		59	$record->add_fields(
		60	[ '001', '5' ],
		61	[ '100', ' ', ' ', a => 'Lastname, Firstname', b => 'b', c => 'c', i => 'i' ]
		62	);
57	} else {	63	} else {
58	undef $record;	64	undef $record;
59	}	65	}
Lines 214-217 subtest 'AddAuthority should respect AUTO_INCREMENT (BZ 18104)' => sub { Link Here
214	is( $record->field('001')->data, $id3, 'Check updated 001' );	220	is( $record->field('001')->data, $id3, 'Check updated 001' );
215	};	221	};
216		222
		223	subtest 'CompareFieldWithAuthority tests' => sub {
		224	plan tests => 3;
		225
		226	t::lib::Mocks::mock_preference('marcflavour', 'MARC21');
		227
		228	$builder->build({ source => 'AuthType', value => { authtypecode => 'PERSO_NAME' }});
		229
		230	my $field = MARC::Field->new('100', 0, 0, a => 'Lastname, Firstname', b => 'b', c => 'c');
		231
		232	ok(C4::AuthoritiesMarc::CompareFieldWithAuthority({'field' => $field, 'authid' => 5}), 'Authority matches');
		233
		234	$field->add_subfields(i => 'X');
		235
		236	ok(C4::AuthoritiesMarc::CompareFieldWithAuthority({'field' => $field, 'authid' => 5}), 'Compare ignores unlisted subfields');
		237
		238	$field->add_subfields(d => 'd');
		239
		240	ok(!C4::AuthoritiesMarc::CompareFieldWithAuthority({'field' => $field, 'authid' => 5}), 'Authority does not match');
		241	};
		242
217	$schema->storage->txn_rollback;	243	$schema->storage->txn_rollback;




#!/usr/bin/perl
#

use strict;
use warnings;

use Test::MockModule;
use Test::More tests => 2;
use MARC::Field;
use MARC::Record;

use t::lib::Mocks;
use t::lib::TestBuilder;

BEGIN {
    use_ok('C4::AuthoritiesMarc::MARC21');
}

my $schema  = Koha::Database->new->schema;
$schema->storage->txn_begin;
my $dbh = C4::Context->dbh;
my $builder = t::lib::TestBuilder->new;

t::lib::Mocks::mock_preference('marcflavour', 'MARC21');

subtest 'CompareFieldWithAuthority tests' => sub {
    plan tests => 3;

    # We are now going to be testing the authorities hierarchy code, and
    # therefore need to pretend that we have consistent data in our database
    my $module = new Test::MockModule('C4::AuthoritiesMarc');
    $module->mock('GetHeaderAuthority', sub {
        return {'authtrees' => ''};
    });
    $module->mock('AddAuthorityTrees', sub {
        return;
    });
    $module->mock('GetAuthority', sub {
        my ($authid) = @_;
        my $record = MARC::Record->new();
        if ($authid eq '1') {
            $record->add_fields(
                [ '001', '1' ],
                [ '151', ' ', ' ', a => 'United States' ]
            );
        } elsif ($authid eq '2') {
            $record->add_fields(
                [ '001', '2' ],
                [ '151', ' ', ' ', a => 'New York (State)' ],
                [ '551', ' ', ' ', a => 'United States', w => 'g', 9 => '1' ]
            );
        } elsif ($authid eq '3') {
            $record->add_fields(
                [ '001', '3' ],
                [ '151', ' ', ' ', a => 'New York (City)' ],
                [ '551', ' ', ' ', a => 'New York (State)', w => 'g', 9 => '2' ]
            );
        } elsif ($authid eq '4') {
            $record->add_fields(
                [ '001', '4' ],
                [ '151', ' ', ' ', a => 'New York (City)' ],
                [ '551', ' ', ' ', a => 'New York (State)', w => 'g' ]
            );
        } elsif ($authid eq '5') {
            $record->add_fields(
                [ '001', '5' ],
                [ '100', ' ', ' ', a => 'Lastname, Firstname', b => 'b', c => 'c', i => 'i' ]
            );
        } else {
            undef $record;
        }
        return $record;
    });

    $dbh->do('DELETE FROM auth_types');
    $builder->build({ source => 'AuthType', value => { authtypecode => 'PERSO_NAME' }});

    my $field = MARC::Field->new('100', 0, 0, a => 'Lastname, Firstname', b => 'b', c => 'c');

    ok(C4::AuthoritiesMarc::CompareFieldWithAuthority({'field' => $field, 'authid' => 5}), 'Authority matches');

    $field->add_subfields(i => 'X');

    ok(C4::AuthoritiesMarc::CompareFieldWithAuthority({'field' => $field, 'authid' => 5}), 'Compare ignores unlisted subfields');

    $field->add_subfields(d => 'd');

    ok(!C4::AuthoritiesMarc::CompareFieldWithAuthority({'field' => $field, 'authid' => 5}), 'Authority does not match');
};

$schema->storage->txn_rollback;

Lines 173-178 sub run_tests { Link Here

(-)a/t/db_dependent/Biblio.t (-1 / +3 lines)
173		173
174	my $marcflavour = shift;	174	my $marcflavour = shift;
175	t::lib::Mocks::mock_preference('marcflavour', $marcflavour);	175	t::lib::Mocks::mock_preference('marcflavour', $marcflavour);
		176	# Authority tests don't interact well with Elasticsearch at the moment due to the fact that there's currently no way to
		177	# roll back ES index changes.
		178	t::lib::Mocks::mock_preference('SearchEngine', 'Zebra');
176		179
177	my $isbn = '0590353403';	180	my $isbn = '0590353403';
178	my $title = 'Foundation';	181	my $title = 'Foundation';
179	-

Return to bug 21958

Lines 68-73 my $bib_heading_fields = { Link Here

(-)a/C4/Heading/MARC21.pm (-13 / +109 lines)
68	subfields => 'adfghklmnoprst',	68	subfields => 'adfghklmnoprst',
69	main_entry => 1	69	main_entry => 1
70	},	70	},
		71	'147' => {
		72	auth_type => 'NAME_EVENT',
		73	subfields => 'acdgvxyz68',
		74	main_entry => 1
		75	},
		76	'148' => {
		77	auth_type => 'CHRON_TERM',
		78	subfields => 'abvxyz68',
		79	main_entry => 1
		80	},
		81	'150' => {
		82	auth_type => 'TOPIC_TERM',
		83	subfields => 'abvxyz68',
		84	main_entry => 1
		85	},
		86	'151' => {
		87	auth_type => 'GEOGR_NAME',
		88	subfields => 'avxyz68',
		89	main_entry => 1
		90	},
		91	'155' => {
		92	auth_type => 'GENRE/FORM',
		93	subfields => 'abvxyz68',
		94	main_entry => 1
		95	},
		96	'162' => {
		97	auth_type => 'MED_PERFRM',
		98	subfields => 'a68',
		99	main_entry => 1
		100	},
		101	'180' => {
		102	auth_type => 'TOPIC_TERM',
		103	subfields => 'vxyz68'
		104	},
		105	'181' => {
		106	auth_type => 'GEOGR_NAME',
		107	subfields => 'vxyz68'
		108	},
		109	'182' => {
		110	auth_type => 'CHRON_TERM',
		111	subfields => 'vxyz68'
		112	},
		113	'185' => {
		114	auth_type => 'GENRE/FORM',
		115	subfields => 'vxyz68'
		116	},
71	'440' => { auth_type => 'UNIF_TITLE', subfields => 'anp', series => 1 },	117	'440' => { auth_type => 'UNIF_TITLE', subfields => 'anp', series => 1 },
72	'600' => {	118	'600' => {
73	auth_type => 'PERSO_NAME',	119	auth_type => 'PERSO_NAME',
Lines 122-165 my $bib_heading_fields = { Link Here
122	my $auth_heading_fields = {	168	my $auth_heading_fields = {
123	'100' => {	169	'100' => {
124	auth_type => 'PERSO_NAME',	170	auth_type => 'PERSO_NAME',
125	subfields => 'abcdfghjklmnopqrstvxyz',	171	subfields => 'abcdefghjklmnopqrstvxyz68',
126	main_entry => 1	172	main_entry => 1
127	},	173	},
128	'110' => {	174	'110' => {
129	auth_type => 'CORPO_NAME',	175	auth_type => 'CORPO_NAME',
130	subfields => 'abcdfghklmnoprstvxyz',	176	subfields => 'abcdefghklmnoprstvxyz68',
131	main_entry => 1	177	main_entry => 1
132	},	178	},
133	'111' => {	179	'111' => {
134	auth_type => 'MEETI_NAME',	180	auth_type => 'MEETI_NAME',
135	subfields => 'acdfghjklnpqstvxyz',	181	subfields => 'acdefghklnpqstvxyz68',
136	main_entry => 1	182	main_entry => 1
137	},	183	},
138	'130' => {	184	'130' => {
139	auth_type => 'UNIF_TITLE',	185	auth_type => 'UNIF_TITLE',
140	subfields => 'adfghklmnoprstvxyz',	186	subfields => 'adfghklmnoprstvxyz68',
		187	main_entry => 1
		188	},
		189	'147' => {
		190	auth_type => 'NAME_EVENT',
		191	subfields => 'acdgvxyz68',
141	main_entry => 1	192	main_entry => 1
142	},	193	},
143	'148' => {	194	'148' => {
144	auth_type => 'CHRON_TERM',	195	auth_type => 'CHRON_TERM',
145	subfields => 'avxyz',	196	subfields => 'abvxyz68',
146	main_entry => 1	197	main_entry => 1
147	},	198	},
148	'150' => {	199	'150' => {
149	auth_type => 'TOPIC_TERM',	200	auth_type => 'TOPIC_TERM',
150	subfields => 'abgvxyz',	201	subfields => 'abvxyz68',
151	main_entry => 1	202	main_entry => 1
152	},	203	},
153	'151' => {	204	'151' => {
154	auth_type => 'GEOG_NAME',	205	auth_type => 'GEOG_NAME',
155	subfields => 'agvxyz',	206	subfields => 'avxyz68',
156	main_entry => 1	207	main_entry => 1
157	},	208	},
158	'155' => {	209	'155' => {
159	auth_type => 'GENRE/FORM',	210	auth_type => 'GENRE/FORM',
160	subfields => 'agvxyz',	211	subfields => 'abvxyz68',
161	main_entry => 1	212	main_entry => 1
162	}	213	},
		214	'162' => {
		215	auth_type => 'MED_PERFRM',
		216	subfields => 'a68',
		217	main_entry => 1
		218	},
		219	'180' => {
		220	auth_type => 'TOPIC_TERM',
		221	subfields => 'vxyz68',
		222	},
		223	'181' => {
		224	auth_type => 'GEOGR_NAME',
		225	subfields => 'vxyz68',
		226	},
		227	'182' => {
		228	auth_type => 'CHRON_TERM',
		229	subfields => 'vxyz68',
		230	},
		231	'185' => {
		232	auth_type => 'GENRE/FORM',
		233	subfields => 'vxyz68',
		234	},
163	};	235	};
164		236
165	=head2 subdivisions	237	=head2 subdivisions
Lines 224-229 sub valid_heading_subfield { Link Here
224	return 0;	296	return 0;
225	}	297	}
226		298
		299	=head2 get_valid_bib_heading_subfields
		300
		301	=cut
		302
		303	sub get_valid_bib_heading_subfields {
		304	my $self = shift;
		305	my $tag = shift;
		306
		307	return $bib_heading_fields->{$tag}->{subfields} // undef;
		308	}
		309
		310	=head2 get_auth_heading_subfields_to_report
		311
		312	=cut
		313
		314	sub get_auth_heading_subfields_to_report {
		315	my $self = shift;
		316	my $tag = shift;
		317
		318	my $subfields = $auth_heading_fields->{$tag}->{subfields} // '';
		319	$subfields =~ s/[68]//;
		320	return $subfields;
		321	}
		322
227	=head2 parse_heading	323	=head2 parse_heading
228		324
229	Given a field and an indicator to specify if it is an authority field or biblio field we return	325	Given a field and an indicator to specify if it is an authority field or biblio field we return

Lines 28-38 INSERT INTO auth_types (authtypecode, authtypetext, auth_tag_to_report, summary) Link Here

(-)a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.sql (-2 / +3 lines)
28	('CORPO_NAME', 'Corporate Name', '110', 'Corporate Names'),	28	('CORPO_NAME', 'Corporate Name', '110', 'Corporate Names'),
29	('MEETI_NAME', 'Meeting Name', '111', 'Meeting Name'),	29	('MEETI_NAME', 'Meeting Name', '111', 'Meeting Name'),
30	('UNIF_TITLE', 'Uniform Title', '130', 'Uniform Title'),	30	('UNIF_TITLE', 'Uniform Title', '130', 'Uniform Title'),
		31	('NAME_EVENT', 'Named Event', '147', 'Named Event'),
31	('CHRON_TERM', 'Chronological Term', '148', 'Chronological Term'),	32	('CHRON_TERM', 'Chronological Term', '148', 'Chronological Term'),
32	('TOPIC_TERM', 'Topical Term', '150', 'Topical Term'),	33	('TOPIC_TERM', 'Topical Term', '150', 'Topical Term'),
33	('GEOGR_NAME', 'Geographic Name', '151', 'Geographic Name'),	34	('GEOGR_NAME', 'Geographic Name', '151', 'Geographic Name'),
34	('GENRE/FORM', 'Genre/Form Term', '155', 'Genre/Form Term');	35	('GENRE/FORM', 'Genre/Form Term', '155', 'Genre/Form Term'),
35		36	('MED_PERFRM', 'Medium of Performance', '162', 'Medium of Performance');
36		37
37	-- ******************************************************	38	-- ******************************************************
38	-- KOHA UNSUPPORTED STANDARD MARC 21 AUTHORITY TYPES.	39	-- KOHA UNSUPPORTED STANDARD MARC 21 AUTHORITY TYPES.

Line 0 Link Here

(-)a/t/db_dependent/AuthoritiesMarc/MARC21.t (+91 lines)
		1	#!/usr/bin/perl
		2	#
		3
		4	use strict;
		5	use warnings;
		6
		7	use Test::MockModule;
		8	use Test::More tests => 2;
		9	use MARC::Field;
		10	use MARC::Record;
		11
		12	use t::lib::Mocks;
		13	use t::lib::TestBuilder;
		14
		15	BEGIN {
		16	use_ok('C4::AuthoritiesMarc::MARC21');
		17	}
		18
		19	my $schema = Koha::Database->new->schema;
		20	$schema->storage->txn_begin;
		21	my $dbh = C4::Context->dbh;
		22	my $builder = t::lib::TestBuilder->new;
		23
		24	t::lib::Mocks::mock_preference('marcflavour', 'MARC21');
		25
		26	subtest 'CompareFieldWithAuthority tests' => sub {
		27	plan tests => 3;
		28
		29	# We are now going to be testing the authorities hierarchy code, and
		30	# therefore need to pretend that we have consistent data in our database
		31	my $module = new Test::MockModule('C4::AuthoritiesMarc');
		32	$module->mock('GetHeaderAuthority', sub {
		33	return {'authtrees' => ''};
		34	});
		35	$module->mock('AddAuthorityTrees', sub {
		36	return;
		37	});
		38	$module->mock('GetAuthority', sub {
		39	my ($authid) = @_;
		40	my $record = MARC::Record->new();
		41	if ($authid eq '1') {
		42	$record->add_fields(
		43	[ '001', '1' ],
		44	[ '151', ' ', ' ', a => 'United States' ]
		45	);
		46	} elsif ($authid eq '2') {
		47	$record->add_fields(
		48	[ '001', '2' ],
		49	[ '151', ' ', ' ', a => 'New York (State)' ],
		50	[ '551', ' ', ' ', a => 'United States', w => 'g', 9 => '1' ]
		51	);
		52	} elsif ($authid eq '3') {
		53	$record->add_fields(
		54	[ '001', '3' ],
		55	[ '151', ' ', ' ', a => 'New York (City)' ],
		56	[ '551', ' ', ' ', a => 'New York (State)', w => 'g', 9 => '2' ]
		57	);
		58	} elsif ($authid eq '4') {
		59	$record->add_fields(
		60	[ '001', '4' ],
		61	[ '151', ' ', ' ', a => 'New York (City)' ],
		62	[ '551', ' ', ' ', a => 'New York (State)', w => 'g' ]
		63	);
		64	} elsif ($authid eq '5') {
65	$record->add_fields(
66	[ '001', '5' ],
67	[ '100', ' ', ' ', a => 'Lastname, Firstname', b => 'b', c => 'c', i => 'i' ]
68	);
69	} else {
70	undef $record;
71	}
72	return $record;
73	});
74
75	$dbh->do('DELETE FROM auth_types');
76	$builder->build({ source => 'AuthType', value => { authtypecode => 'PERSO_NAME' }});
77
78	my $field = MARC::Field->new('100', 0, 0, a => 'Lastname, Firstname', b => 'b', c => 'c');
79
80	ok(C4::AuthoritiesMarc::CompareFieldWithAuthority({'field' => $field, 'authid' => 5}), 'Authority matches');
81
82	$field->add_subfields(i => 'X');
83
84	ok(C4::AuthoritiesMarc::CompareFieldWithAuthority({'field' => $field, 'authid' => 5}), 'Compare ignores unlisted subfields');
85
86	$field->add_subfields(d => 'd');
87
88	ok(!C4::AuthoritiesMarc::CompareFieldWithAuthority({'field' => $field, 'authid' => 5}), 'Authority does not match');
89	};
90
91	$schema->storage->txn_rollback;