From c217b2c4186e3e449872ed009a11d7210b7968b9 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 28 Oct 2014 12:02:34 -0300 Subject: [PATCH] Revert "Bug 9828: More specific indexing of UNIMARC 6XX fields" This reverts commit 0dd1ac40a0df984bee6583f13f80744b539b8f37. --- C4/Search.pm | 6 - etc/zebradb/biblios/etc/bib1.att | 4 +- etc/zebradb/ccl.properties | 43 +- .../unimarc/biblios/biblio-koha-indexdefs.xml | 711 +++--------------- .../biblios/biblio-zebra-indexdefs.xsl | 632 +++++----------- 5 files changed, 291 insertions(+), 1105 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index 4de0931fe0..1326f692bb 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1215,15 +1215,9 @@ sub getIndexes{ 'Subject-subdivision', 'Summary', 'Suppress', - 'su-chrono', - 'su-corp', - 'su-conf', 'su-geo', - 'su-form', - 'su-genre', 'su-na', 'su-to', - 'su-ti', 'su-ut', 'ut', 'Term-genre-form', diff --git a/etc/zebradb/biblios/etc/bib1.att b/etc/zebradb/biblios/etc/bib1.att index bf344cebd5..ed8c64b38a 100644 --- a/etc/zebradb/biblios/etc/bib1.att +++ b/etc/zebradb/biblios/etc/bib1.att @@ -142,8 +142,8 @@ att 1071 Section-heading att 1072 Subject-GOO att 1073 Subject-name-conference att 1074 Subject-name-corporate -att 1075 Subject-genre-form -att 1076 Subject-name-geographical +att 1075 Subject-genre/form +att 1076 Subject-name-gerographical att 1077 Subject-chronological att 1078 Subject-title att 1079 Subject-topical diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties index 85611d3562..99e3498e4b 100644 --- a/etc/zebradb/ccl.properties +++ b/etc/zebradb/ccl.properties @@ -625,7 +625,9 @@ rcn Record-control-number # 655, 656, 657, 69X Subject 1=21 su Subject - +su-to Subject +su-geo Subject +su-ut Subject #Subject-BDI 23 Subject headings from # Bibliotek Dokumentasjon # Informasjon -- a controlled @@ -674,7 +676,7 @@ su Subject # appears in a subject heading. Subject-name-personal 1=1009 su-na 1=1009 - +#Subject-name-personal #Subject-PA 26 Subject headings from 600i2, 610i2, # Thesaurus of Psychological 611i2, 630i2, # Index Terms -- maintained 650i2, 651i2 @@ -720,43 +722,11 @@ su-na 1=1009 #Subject-subdivision 47 An extension to a subject 6XX$x, 6XX$y, # heading indicating the form, 6XX$z -# place, period of time treated, UNIMARC 6XX$j +# place, period of time treated, # or aspect of the subject # treated. Subject-subdivision 1=47 -#Subject-name-conference 1073 MARC21 611 ; UNIMARC 601 -Subject-name-conference 1=1073 -su-conf Subject-name-conference - -#Subject-name-corporate 1074 MARC21 610 ; UNIMARC 601 -Subject-name-corporate 1=1074 -su-corp Subject-name-corporate - -#Subject-genre-form 1075 MARC21 610 ; UNIMARC 608 -# UNIMARC 6XX$j -Subject-genre-form 1=1075 -su-genre Subject-genre-form -su-form Subject-genre-form - -#Subject-geographical 1076 MARC21 651 ; UNIMARC 607 -# MARC21 AND UNIMARC 6XX$y -Subject-geographical 1=1076 -su-geo Subject-geographical - -#Subject-chronological 1077 MARC21 and UNIMARC 6XX$z -Subject-chronological 1=1077 -su-chrono Subject-chronological - -#Subject-title 1078 MARC21 630 ; UNIMARC 605 -Subject-title 1=1078 -su-ut Subject-title -su-ti Subject-title - -#Subject-topical 1079 MARC21 650 ; UNIMARC 606 -Subject-topical 1=1079 -su-to Subject-topical - #Title 4 A word, phrase, character, 130, 21X-24X, 440, # or group of characters, 490, 730, 740, 830, # normally appearing in an item, 840, subfield $t @@ -1248,6 +1218,9 @@ sort3 7=3 #corporateName 1=2 #conferenceName 1=3 #uniformTitle 1=6 +#geographicName 1=58 +#topicalSubject 1=1079 +#genreForm 1=1075 ################################################### # Rules for a few GILS fields diff --git a/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml b/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml index 81fac14731..10dc41ec55 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml +++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml @@ -1156,683 +1156,148 @@ Title:p - - - - - - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - Koha-Auth-Number:w - Koha-Auth-Number:n - - - - - - - + + Personal-name:w Personal-name:p - Subject-name-personal:w - Subject-name-personal:p Subject:w Subject:p - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-genre-form:w - Subject-genre-form:p - Subject-name-personal:w - Subject-name-personal:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-name-personal:w - Subject-name-personal:p + + Koha-Auth-Number:w + Koha-Auth-Number:n - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-name-geographical:w - Subject-name-geographical:p - Subject-name-personal:w - Subject-name-personal:p - - - + Subject:w Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-chronological:w - Subject-chronological:p - Subject-name-personal:w - Subject-name-personal:p - - - - - - - - - - + + + Corporate-name:w - Corporate-name:p Conference-name:w + Corporate-name:p Conference-name:p - Subject-name-conference:w - Subject-name-conference:p - Subject-name-corporate:w - Subject-name-corporate:p - Subject:w - Subject:p - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-genre-form:w - Subject-genre-form:p - Subject-name-conference:w - Subject-name-conference:p - Subject-name-corporate:w - Subject-name-corporate:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-name-conference:w - Subject-name-conference:p - Subject-name-corporate:w - Subject-name-corporate:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-name-geographical:w - Subject-name-geographical:p - Subject-name-conference:w - Subject-name-conference:p - Subject-name-corporate:w - Subject-name-corporate:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-chronological:w - Subject-chronological:p - Subject-name-conference:w - Subject-name-conference:p - Subject-name-corporate:w - Subject-name-corporate:p - - - - - - - - - Personal-name:w - Personal-name:p - Subject-name-personal:w - Subject-name-personal:p - Subject:w - Subject:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-genre-form:w - Subject-genre-form:p - Subject-name-personal:w - Subject-name-personal:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-name-personal:w - Subject-name-personal:p + + Koha-Auth-Number:w + Koha-Auth-Number:n - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-name-geographical:w - Subject-name-geographical:p - Subject-name-personal:w - Subject-name-personal:p - - - + Subject:w Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-chronological:w - Subject-chronological:p - Subject-name-personal:w - Subject-name-personal:p - - - - - - - - Name-and-title:w - Name-and-title:p - Subject-title:w - Subject-title:p + + + Personal-name:w Personal-name:p - Subject-name-personal:w - Subject-name-personal:p - Subject:w - Subject:p - - - - Name-and-title:w - Name-and-title:p - Subject-title:w - Subject-title:p - Subject-name-personal:w - Subject-name-personal:p - Subject:w - Subject:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-genre-form:w - Subject-genre-form:p - Subject-title:w - Subject-title:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-title:w - Subject-title:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-name-geographical:w - Subject-name-geographical:p - Subject-title:w - Subject-title:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-chronological:w - Subject-chronological:p - Subject-title:w - Subject-title:p - - - - - - - Subject-title:w - Subject-title:p - Subject:w - Subject:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-genre-form:w - Subject-genre-form:p - Subject-title:w - Subject-title:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-title:w - Subject-title:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-name-geographical:w - Subject-name-geographical:p - Subject-title:w - Subject-title:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-chronological:w - Subject-chronological:p - Subject-title:w - Subject-title:p - - - - - - - Subject-topical:w - Subject-topical:p - Subject:w - Subject:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-genre-form:w - Subject-genre-form:p - Subject-topical:w - Subject-topical:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-topical:w - Subject-topical:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-name-geographical:w - Subject-name-geographical:p - Subject-topical:w - Subject-topical:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-chronological:w - Subject-chronological:p - Subject-topical:w - Subject-topical:p - - - - - - - Name-geographic:w - Name-geographic:p - Subject-name-geographical:w - Subject-name-geographical:p - Subject:w - Subject:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-genre-form:w - Subject-genre-form:p - Subject-name-geographical:w - Subject-name-geographical:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-name-geographical:w - Subject-name-geographical:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-name-geographical:w - Subject-name-geographical:p - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-chronological:w - Subject-chronological:p - Subject-name-geographical:w - Subject-name-geographical:p - - - - - - - Subject-genre-form:w - Subject-genre-form:p - Subject:w - Subject:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-genre-form:w - Subject-genre-form:p + + Koha-Auth-Number:w + Koha-Auth-Number:n - - + Subject:w Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-genre-form:w - Subject-genre-form:p + + + + Koha-Auth-Number:w + Koha-Auth-Number:n - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-name-geographical:w - Subject-name-geographical:p - Subject-genre-form:w - Subject-genre-form:p - - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-chronological:w - Subject-chronological:p - Subject-genre-form:w - Subject-genre-form:p - - - - - + Subject:w Subject:p + + + + Koha-Auth-Number:w + Koha-Auth-Number:n - - - - - - + Subject:w Subject:p + + + + Koha-Auth-Number:w + Koha-Auth-Number:n - - - - - - - + Subject:w Subject:p + + + + Koha-Auth-Number:w + Koha-Auth-Number:n - - + Subject:w Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-genre-form:w - Subject-genre-form:p + + + + Koha-Auth-Number:w + Koha-Auth-Number:n - - + Subject:w Subject:p - Subject-subdivision:w - Subject-subdivision:p + + + + Koha-Auth-Number:w + Koha-Auth-Number:n - - + Subject:w Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-name-geographical:w - Subject-name-geographical:p + + + + Koha-Auth-Number:w + Koha-Auth-Number:n - - - Subject:w - Subject:p - Subject-subdivision:w - Subject-subdivision:p - Subject-chronological:w - Subject-chronological:w - - - - - - - + Subject:w Subject:p + + + + Koha-Auth-Number:w + Koha-Auth-Number:n - - - - - - - + Subject:w Subject:p + + + + Koha-Auth-Number:w + Koha-Auth-Number:n - - - - - - + Subject:w Subject:p + + + + Koha-Auth-Number:w + Koha-Auth-Number:n - - - - - - + Subject:w Subject:p + + + + Koha-Auth-Number:w + Koha-Auth-Number:n - - - - + Subject:w Subject:p - + diff --git a/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl b/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl index ef2ff9e3d1..a8cde51614 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl +++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl @@ -1657,49 +1657,12 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - @@ -1707,43 +1670,15 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - @@ -1751,37 +1686,18 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + - - - - - - - - - - - - - - - - - - - - - - - + + - - + + @@ -1795,48 +1711,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1846,41 +1720,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1890,41 +1729,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1934,41 +1738,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1978,43 +1747,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2022,13 +1754,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - @@ -2038,13 +1763,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - @@ -2054,41 +1772,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2098,13 +1781,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - @@ -2114,13 +1790,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - @@ -2130,103 +1799,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2680,6 +2252,188 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.20.1