From 9b780a4abec11fad7849a6b3796f01dec8977bca Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Tue, 22 Dec 2020 11:07:03 +0100 Subject: [PATCH] Bug 18017: Use index_heading and index_match_heading in UNIMARC authorities zebra configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For a good management of autorities linking to biblio records, MARC21 uses index_heading and index_match_heading in authorities zebra configuration. UNIMARC configuration must use the same. This patch adds in UNIMARC authorities zebra configuration index_heading and index_match_heading to earch heading in order to be maximum close to MARC21 authorities zebra configuration. See changes made in MARC21 : https://git.koha-community.org/Koha-community/Koha/commit/32cf2af700dfea15d9c4f99bee97e97c85643896 It fixes some indexes names : Personal-name-see => Personal-name-see-from Removes useless Term-geographic index, a duplicate of Name-geographic. Sometimes parallel 7xx form whas only on $a, it must contains same subfields has the main heading. Test plan : =========== 1.0) Use a UNIMARC install without patch 1.1) Set sysprefs BiblioAddsAuthorities = ON AutoCreateAuthorities = ON LinkerModule = First Match 1.2) Replace authorities zebra configuration files cp $KOHA_CLONE/etc/zebradb/marc_defs/unimarc/authorities/authority-koha-indexdefs.xml $KOHA_CONF_DIR/zebradb/marc_defs/unimarc/authorities/authority-koha-indexdefs.xml cp $KOHA_CLONE/etc/zebradb/marc_defs/unimarc/authorities/authority-zebra-indexdefs.xsl $KOHA_CONF_DIR/zebradb/marc_defs/unimarc/authorities/authority-zebra-indexdefs.xsl 1.3) Restart zebra server and indexer services 1.4) Reindex authorities ./misc/migration_tools/rebuild_zebra.pl -r -a -v 1.5) Search in Z3950 a record with complex heading (with subdivisions), for example ISBN 2877620115 "Facteurs culturels et sociaux de la santé en Afrique de l'Oues" 1.6) Import this record and save it : authorities are created go to staff:/cgi-bin/koha/cataloguing/addbooks.pl 1.7) Reimport the same record (when asked, say that it's not a duplicate) 1.8) The authority should have been duplicated : different url and different $9 value 2.0) Apply this patch 2.1) Replace again the authorities zebra configuration files 2.2) Restart zebra server and indexer services 2.3) Reindex authorities 2.4) Reimport the same record 2.5) The authority should have not been duplicated 3.0) Play with authorities search to check every mode : Search main heading ($a only) Search main heading Search all headings Search entire record --- .../authorities/authority-koha-indexdefs.xml | 974 ++++++++++-------- 1 file changed, 560 insertions(+), 414 deletions(-) diff --git a/etc/zebradb/marc_defs/unimarc/authorities/authority-koha-indexdefs.xml b/etc/zebradb/marc_defs/unimarc/authorities/authority-koha-indexdefs.xml index 91399e3ad7..8ac00c6ee5 100644 --- a/etc/zebradb/marc_defs/unimarc/authorities/authority-koha-indexdefs.xml +++ b/etc/zebradb/marc_defs/unimarc/authorities/authority-koha-indexdefs.xml @@ -17,637 +17,783 @@ authority-zebra-indexdefs.xsl` Local-Number:w Local-Number:p - Local-Number:s Local-Number:n + Local-Number:s Personal-name:w Personal-name:p + Personal-name:s + + + Personal-name-heading:w + Personal-name-heading:p + Personal-name-heading:s Heading:w Heading:p - Match:w - Match:p - Match-heading:w - Match-heading:p - - Heading:s + + Heading-Main:w Heading-Main:p Heading-Main:s - Personal-name-heading:w - Personal-name-heading:p - Personal-name-heading:s - - - - Personal-name-see:w - Personal-name-see:p - See:w - See:p + + Match:w Match:p - Match-heading-see-form:w - Match-heading-see-form:p - - - - Personal-name-see-also:w - Personal-name-see-also:p - See-also:w - See-also:p - Match:w - Match:p - - - + Match-heading:w + Match-heading:p + Match-heading:s + + + + Personal-name-see-from:w + Personal-name-see-from:p + Personal-name-see-from:s + See-from:w + See-from:p + See-from:s + + + Match:w + Match:p + Match-heading-see-from:w + Match-heading-see-from:p + Match-heading-see-from:s + + + + Personal-name-see-also-from:w + Personal-name-see-also-from:p + Personal-name-see-also-from:s + See-also-from:w + See-also-from:p + See-also-from:s + + + Match:w + Match:p + + + Personal-name-parallel:w + Personal-name-parallel:p Personal-name-parallel:s Parallel:w Parallel:p + Parallel:s + + Match:w Match:p - + Corporate-name:w Corporate-name:p + Corporate-name:s Conference-name:w Conference-name:p - Heading:w - Heading:p - Match:w - Match:p - Match-heading:w - Match-heading:p + Conference-name:s - - Heading:s - Heading-Main:w - Heading-Main:p - Heading-Main:s + Corporate-name-heading:w Corporate-name-heading:p Corporate-name-heading:s Conference-name-heading:w Conference-name-heading:p Conference-name-heading:s - - - - Corporate-name-see:w - Corporate-name-see:p - Conference-name-see:w - Conference-name-see:p - See:w - See:p - Match:w - Match:p - Match-heading-see-form:w - Match-heading-see-form:p - - - - Corporate-name-see-also:w - Corporate-name-see-also:p - Conference-name-see-also:w - Conference-name-see-also:p - See-also:w - See-also:p + Heading:w + Heading:p + Heading:s + + + Heading-Main:w + Heading-Main:p + Heading-Main:s + + Match:w Match:p - - - + Match-heading:w + Match-heading:p + Match-heading:s + + + + Corporate-name-see-from:w + Corporate-name-see-from:p + Corporate-name-see-from:s + Conference-name-see-from:w + Conference-name-see-from:p + Conference-name-see-from:s + See-from:w + See-from:p + See-from:s + + + Match:w + Match:p + Match-heading-see-from:w + Match-heading-see-from:p + Match-heading-see-from:s + + + + Corporate-name-see-also-from:w + Corporate-name-see-also-from:p + Corporate-name-see-also-from:s + Conference-name-see-also-from:w + Conference-name-see-also-from:p + Conference-name-see-also-from:s + See-also-from:w + See-also-from:p + See-also-from:s + + + Match:w + Match:p + + + Corporate-name-parallel:w + Corporate-name-parallel:p Corporate-name-parallel:s Conference-name-parallel:w + Conference-name-parallel:p Conference-name-parallel:s Parallel:w Parallel:p + Parallel:s + + Match:w Match:p - + Name-geographic:w Name-geographic:p Name-geographic:s - Term-geographic:w - Term-geographic:p - Term-geographic:s + + + Name-geographic-heading:w + Name-geographic-heading:p + Name-geographic-heading:s Heading:w Heading:p Heading:s - Match:w - Match:p - Match-heading:w - Match-heading:p - - + + Heading-Main:w Heading-Main:p Heading-Main:s - Name-geographic-heading:w - Name-geographic-heading:p - Name-geographic-heading:s - Term-geographic-heading:w - Term-geographic-heading:p - Term-geographic-heading:s - - - - Name-geographic-see:w - Name-geographic-see:p - Term-geographic-see:w - Term-geographic-see:p - Term-geographic-see:s - See:w - See:p - See:s - Match:w - Match:p - Match-heading-see-form:w - Match-heading-see-form:p - - - - Name-geographic-see-also:w - Name-geographic-see-also:p - Term-geographic-see-also:w - Term-geographic-see-also:p - Term-geographic-see-also:s - See-also:w - See-also:p + + Match:w Match:p - - - + Match-heading:w + Match-heading:p + Match-heading:s + + + + Name-geographic-see-from:w + Name-geographic-see-from:p + Name-geographic-see-from:s + See-from:w + See-from:p + See-from:s + + + Match:w + Match:p + Match-heading-see-from:w + Match-heading-see-from:p + Match-heading-see-from:s + + + + Name-geographic-see-also-from:w + Name-geographic-see-also-from:p + Name-geographic-see-also-from:s + See-also-from:w + See-also-from:p + See-also-from:s + + + Match:w + Match:p + + + Name-geographic-parallel:w + Name-geographic-parallel:p Name-geographic-parallel:s - Term-geographic-parallel:w - Term-geographic-parallel:s - Term-geographic-parallel:p Parallel:w Parallel:p + Parallel:s + + Match:w Match:p - + Trademark:w Trademark:p + Trademark:s + + + Trademark-heading:w + Trademark-heading:p + Trademark-heading:s Heading:w Heading:p - Match:w - Match:p - Match-heading:w - Match-heading:p - - Heading:s + + Heading-Main:w Heading-Main:p Heading-Main:s - Trademark-heading:w - Trademark-heading:p - Trademark-heading:s - - - - Trademark-see:w - Trademark-see:p - See:w - See:p - Match:w - Match:p - Match-heading-see-form:w - Match-heading-see-form:p - - - - Trademark-see-also:w - Trademark-see-also:p - See-also:w - See-also:p + + Match:w Match:p - - - + Match-heading:w + Match-heading:p + Match-heading:s + + + + Trademark-see-from:w + Trademark-see-from:p + Trademark-see-from:s + See-from:w + See-from:p + See-from:s + + + Match:w + Match:p + Match-heading-see-from:w + Match-heading-see-from:p + Match-heading-see-from:s + + + + Trademark-see-also-from:w + Trademark-see-also-from:p + Trademark-see-also-from:s + See-also-from:w + See-also-from:p + See-also-from:s + + + Match:w + Match:p + + + Trademark-parallel:w + Trademark-parallel:p Trademark-parallel:s Parallel:w Parallel:p + Parallel:s + + Match:w Match:p - + Name:w Name:p + Name:s + + + Name-heading:w + Name-heading:p + Name-heading:s Heading:w Heading:p - Match:w - Match:p - Match-heading:w - Match-heading:p - - Heading:s + + Heading-Main:w Heading-Main:p Heading-Main:s - Name-heading:w - Name-heading:p - Name-heading:s - - - - Name-see:w - Name-see:p - See:w - See:p + + Match:w Match:p - Match-heading-see-form:w - Match-heading-see-form:p - - - - Name-see-also:w - Name-see-also:p - See-also:w - See-also:p - Match:w - Match:p - - - + Match-heading:w + Match-heading:p + Match-heading:s + + + + Name-see-from:w + Name-see-from:p + Name-see-from:s + See-from:w + See-from:p + See-from:s + + + Match:w + Match:p + Match-heading-see-from:w + Match-heading-see-from:p + Match-heading-see-from:s + + + + Name-see-also-from:w + Name-see-also-from:p + Name-see-also-from:s + See-also-from:w + See-also-from:p + See-also-from:s + + + Match:w + Match:p + + + Name-parallel:w + Name-parallel:p Name-parallel:s Parallel:w Parallel:p + Parallel:s + + Match:w Match:p - + Title-uniform:w Title-uniform:p + Title-uniform:s + + + Title-uniform-heading:w + Title-uniform-heading:p + Title-uniform-heading:s Heading:w Heading:p - Match:w - Match:p - Match-heading:w - Match-heading:p - - Heading:s + + Heading-Main:w Heading-Main:p Heading-Main:s - Title-uniform-heading:w - Title-uniform-heading:p - Title-uniform-heading:s - - - - Title-uniform-see:w - Title-uniform-see:p - See:w - See:p - Match:w - Match:p - Match-heading-see-form:w - Match-heading-see-form:p - - - - Title-uniform-see-also:w - Title-uniform-see-also:p - See-also:w - See-also:p + + Match:w Match:p - - - + Match-heading:w + Match-heading:p + Match-heading:s + + + + Title-uniform-see-from:w + Title-uniform-see-from:p + Title-uniform-see-from:s + See-from:w + See-from:p + See-from:s + + + Match:w + Match:p + Match-heading-see-from:w + Match-heading-see-from:p + Match-heading-see-from:s + + + + Title-uniform-see-also-from:w + Title-uniform-see-also-from:p + Title-uniform-see-also-from:s + See-also-from:w + See-also-from:p + See-also-from:s + + + Match:w + Match:p + + + Title-uniform-parallel:w + Title-uniform-parallel:p Title-uniform-parallel:s Parallel:w Parallel:p + Parallel:s + + Match:w Match:p - + Title-uniform:w Title-uniform:p + Title-uniform:s + + + Title-uniform-heading:w + Title-uniform-heading:p + Title-uniform-heading:s Heading:w Heading:p - Match:w - Match:p - Match-heading:w - Match-heading:p - - Heading:s + + Heading-Main:w Heading-Main:p Heading-Main:s - Title-uniform-heading:w - Title-uniform-heading:p - Title-uniform-heading:s - - - - Title-uniform-see:w - Title-uniform-see:p - See:w - See:p - Match:w - Match:p - Match-heading-see-form:w - Match-heading-see-form:p - - - - Title-uniform-see-also:w - Title-uniform-see-also:p - See-also:w - See-also:p + + Match:w Match:p - - - + Match-heading:w + Match-heading:p + Match-heading:s + + + + Title-uniform-see-from:w + Title-uniform-see-from:p + Title-uniform-see-from:s + See-from:w + See-from:p + See-from:s + + + Match:w + Match:p + Match-heading-see-from:w + Match-heading-see-from:p + Match-heading-see-from:s + + + + Title-uniform-see-also-from:w + Title-uniform-see-also-from:p + Title-uniform-see-also-from:s + See-also-from:w + See-also-from:p + See-also-from:s + + + Match:w + Match:p + + + Title-uniform-parallel:w + Title-uniform-parallel:p Title-uniform-parallel:s Parallel:w Parallel:p + Parallel:s + + Match:w Match:p - + Name-Title:w Name-Title:p - Heading:w - Heading:p - Match:w - Match:p - Match-heading:w - Match-heading:p + Name-Title:s - - Heading:s - Heading-Main:w - Heading-Main:p - Heading-Main:s + Name-Title-heading:w Name-Title-heading:p Name-Title-heading:s - - - - Name-Title-see:w - Name-Title-see:p - See:w - See:p - Match:w - Match:p - Match-heading-see-form:w - Match-heading-see-form:p - - - - Name-Title-see-also:w - Name-Title-see-also:p - See-also:w - See-also:p - Match:w - Match:p - - - - Name-Title-parallel:w - Name-Title-parallel:s - Parallel:w - Parallel:p - Match:w - Match:p - - - - - Title-uniform:w - Title-uniform:p Heading:w Heading:p - Match:w - Match:p - Match-heading:w - Match-heading:p - - Heading:s + + Heading-Main:w Heading-Main:p Heading-Main:s - Title-uniform-heading:w - Title-uniform-heading:p - Title-uniform-heading:s - - - - Title-uniform-see:w - Title-uniform-see:p - See:w - See:p + + Match:w Match:p - Match-heading-see-form:w - Match-heading-see-form:p - - - - Title-uniform-see-also:w - Title-uniform-see-also:p - See-also:w - See-also:p - Match:w - Match:p - - - - Title-uniform-parallel:w - Title-uniform-parallel:s + Match-heading:w + Match-heading:p + Match-heading:s + + + + Name-Title-see-from:w + Name-Title-see-from:p + Name-Title-see-from:s + See-from:w + See-from:p + See-from:s + + + Match:w + Match:p + Match-heading-see-from:w + Match-heading-see-from:p + Match-heading-see-from:s + + + + Name-Title-see-also-from:w + Name-Title-see-also-from:p + Name-Title-see-also-from:s + See-also-from:w + See-also-from:p + See-also-from:s + + + Match:w + Match:p + + + + Name-Title-parallel:w + Name-Title-parallel:p + Name-Title-parallel:s Parallel:w Parallel:p + Parallel:s + + Match:w Match:p - + - Subject:w - Subject:p + Subject-topical:w + Subject-topical:p + Subject-topical:s + + + Subject-topical-heading:w + Subject-topical-heading:p + Subject-topical-heading:s Heading:w Heading:p - Match:w - Match:p - Match-heading:w - Match-heading:p - Subject-heading:w - Subject-heading:p - Subject-heading:s - - Heading:s + + Heading-Main:w Heading-Main:p Heading-Main:s - - - - Subject-see:w - Subject-see:p - See:w - See:p + + Match:w Match:p - Match-heading-see-form:w - Match-heading-see-form:p - - - - Subject-see-also:w - Subject-see-also:p - See-also:w - See-also:p - Match:w - Match:p - - - - Subject-parallel:w - Subject-parallel:s + Match-heading:w + Match-heading:p + Match-heading:s + + + + Subject-topical-see-from:w + Subject-topical-see-from:p + Subject-topical-see-from:s + See-from:w + See-from:p + See-from:s + + + Match:w + Match:p + Match-heading-see-from:w + Match-heading-see-from:p + Match-heading-see-from:s + + + + Subject-topical-see-also-from:w + Subject-topical-see-also-from:p + Subject-topical-see-also-from:s + See-also-from:w + See-also-from:p + See-also-from:s + + + Match:w + Match:p + + + + Subject-topical-parallel:w + Subject-topical-parallel:p + Subject-topical-parallel:s Parallel:w Parallel:p + Parallel:s + + Match:w Match:p - + Place:w Place:p - Heading:w - Heading:p - Match:w - Match:p - Match-heading:w - Match-heading:p + Place:s + + Place-heading:w Place-heading:p Place-heading:s - - + Heading:w + Heading:p Heading:s + + Heading-Main:w Heading-Main:p Heading-Main:s - - - - Place-see:w - Place-see:p - See:w - See:p + + Match:w Match:p - Match-heading-see-form:w - Match-heading-see-form:p - - - - Place-see-also:w - Place-see-also:p - See-also:w - See-also:p - Match:w - Match:p - - - + Match-heading:w + Match-heading:p + Match-heading:s + + + + Place-see-from:w + Place-see-from:p + Place-see-from:s + See-from:w + See-from:p + See-from:s + + + Match:w + Match:p + Match-heading-see-from:w + Match-heading-see-from:p + Match-heading-see-from:s + + + + Place-see-also-from:w + Place-see-also-from:p + Place-see-also-from:s + See-also-from:w + See-also-from:p + See-also-from:s + + + Match:w + Match:p + + + Place-parallel:w + Place-parallel:p Place-parallel:s Parallel:w Parallel:p + Parallel:s + + Match:w Match:p - + Form:w Form:p - Heading:w - Heading:p - Match:w - Match:p - Match-heading:w - Match-heading:p + Form:s + + Form-heading:w Form-heading:p Form-heading:s - - + Heading:w + Heading:p Heading:s + + Heading-Main:w Heading-Main:p Heading-Main:s - - - - Form-see:w - Form-see:p - See:w - See:p + + Match:w Match:p - Match-heading-see-form:w - Match-heading-see-form:p - - - - Form-see-also:w - Form-see-also:p - See-also:w - See-also:p - Match:w - Match:p - - - + Match-heading:w + Match-heading:p + Match-heading:s + + + + Form-see-from:w + Form-see-from:p + Form-see-from:s + See-from:w + See-from:p + See-from:s + + + Match:w + Match:p + Match-heading-see-from:w + Match-heading-see-from:p + Match-heading-see-from:s + + + + Form-see-also-from:w + Form-see-also-from:p + Form-see-also-from:s + See-also-from:w + See-also-from:p + See-also-from:s + + + Match:w + Match:p + + + Form-parallel:w + Form-parallel:p Form-parallel:s Parallel:w Parallel:p + Parallel:s + + Match:w Match:p - + -- 2.29.2