From b108a111f61fe3fdab1c7471eeb5eff6b063c30a Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 28 Oct 2014 12:02:09 -0300 Subject: [PATCH] Revert "Bug 9828 : Followup for Queryparser and deletion of useless 6XX$9" This reverts commit 49788987b29f14884a59d41602c7821fec03e491. --- etc/searchengine/queryparser.yaml | 105 +++--------------- etc/zebradb/ccl.properties | 6 +- .../unimarc/biblios/biblio-koha-indexdefs.xml | 38 ++++++- .../biblios/biblio-zebra-indexdefs.xsl | 66 ++++++++++- 4 files changed, 112 insertions(+), 103 deletions(-) diff --git a/etc/searchengine/queryparser.yaml b/etc/searchengine/queryparser.yaml index 717df1ea48..d9f637bfd3 100644 --- a/etc/searchengine/queryparser.yaml +++ b/etc/searchengine/queryparser.yaml @@ -1196,7 +1196,9 @@ field_mappings: label: '' aliases: - su - authority-number: + - su-to + - su-geo + - su-ut authority-number: bib1_mapping: biblioserver: @@ -1268,6 +1270,16 @@ field_mappings: aliases: - matchheading - match-heading + name-personal: + bib1_mapping: + biblioserver: + 1: 1009 + enabled: 1 + index: name-personal + label: Name-personal + aliases: + - name-personal + - su-na index-term-genre: bib1_mapping: biblioserver: @@ -1309,97 +1321,6 @@ field_mappings: label: Start aliases: - start - subject-chronological: - bib1_mapping: - biblioserver: - 1: 1077 - enabled: 1 - index: subject-chronological - label: Subject-chronological - aliases: - - subject-chronological - - su-chrono - subject-division: - bib1_mapping: - biblioserver: - 1: 47 - enabled: 1 - index: subject-division - label: Subject-division - aliases: - - subject-division - subject-genre-form: - bib1_mapping: - biblioserver: - 1: 1075 - enabled: 1 - index: subject-genre-form - label: Subject-genre-form - aliases: - - subject-genre-form - - su-genre - - su-form - subject-name-conference: - bib1_mapping: - biblioserver: - 1: 1073 - enabled: 1 - index: subject-name-conference - label: Subject-name-conference - aliases: - - subject-name-conference - - su-conf - subject-name-corporate: - bib1_mapping: - biblioserver: - 1: 1074 - enabled: 1 - index: subject-name-corporate - label: Subject-name-corporate - aliases: - - subject-name-corporate - - su-corp - subject-name-geographical: - bib1_mapping: - biblioserver: - 1: 1076 - enabled: 1 - index: subject-name-geographical - label: Subject-name-geographical - aliases: - - subject-name-geographical - - su-geo - subject-name-personal: - bib1_mapping: - biblioserver: - 1: 1009 - enabled: 1 - index: subject-name-personal - label: Subject-name-personal - aliases: - - subject-name-personal - - su-na - subject-title: - bib1_mapping: - biblioserver: - 1: 1078 - enabled: 1 - index: subject-title - label: Subject-title - aliases: - - subject-title - - su-ti - - su-ut - subject-topical: - bib1_mapping: - biblioserver: - 1: 1079 - enabled: 1 - index: subject-topical - label: Subject-topical - aliases: - - subject-topical - - su-to title: title: bib1_mapping: diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties index f0c09347bb..85611d3562 100644 --- a/etc/zebradb/ccl.properties +++ b/etc/zebradb/ccl.properties @@ -739,10 +739,10 @@ Subject-genre-form 1=1075 su-genre Subject-genre-form su-form Subject-genre-form -#Subject-name-geographical 1076 MARC21 651 ; UNIMARC 607 +#Subject-geographical 1076 MARC21 651 ; UNIMARC 607 # MARC21 AND UNIMARC 6XX$y -Subject-name-geographical 1=1076 -su-geo Subject-name-geographical +Subject-geographical 1=1076 +su-geo Subject-geographical #Subject-chronological 1077 MARC21 and UNIMARC 6XX$z Subject-chronological 1=1077 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 55462c1e97..85f50f8626 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml +++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml @@ -1232,13 +1232,43 @@ 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 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 9de15be82a..ef2ff9e3d1 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl +++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl @@ -2138,7 +2138,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + @@ -2146,15 +2146,44 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2162,6 +2191,35 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.39.5