From 167a75034d3dd0405f89326ee84d31afe5a66851 Mon Sep 17 00:00:00 2001 From: Mathieu Saby Date: Mon, 11 Feb 2013 10:46:20 +0100 Subject: [PATCH 2/2] Bug 9352 : More specific indexing of UNIMARC 7XX fields (DOM) 2d patch, for DOM indexing Same test as first patch : Testing : a/ Create a record with : 700$a Doe $b John $f1950 $cteacher $4070 710$a Corporate $b Meeting $q Address 716$a Trademark $f1960 $cgreat $4340 720$a Family $f1980 $4651 205$a 1st edition $fBy some guy $gAnd other guys b/ Before applying patch, make several searches : Search in simple search and author search : "teacher", "great", "Address", "1950", "1960", "070", "340", "651" => you will see the record among the results Search in simple search and author search : "Doe", "John Doe", "Trademark", "Family","corporate", "meeting" => you will see the record among the results Search in simple search and author search : "guy", "guys" => you will see the record among the results with simple search (because 205 is indexed in title) => you will not see the record among the results with author search c/ Apply patch d/ Rebuild Zebra with ./misc/migration_tools/rebuild_zebra.pl -b -x -v -reset e/ Try the same searches as before : Search in simple search and author search : "teacher", "great", "Address", "1950", "1960", "070", "340", "651" => you will not see the record among the results Search in simple search and author search : "Doe", "John Doe", "Trademark", "Family","corporate", "meeting" => you will see the record among the results Search in simple search and author search : "guy", "guys" => you will see the record among the results in both simple search and author search --- .../unimarc/biblios/biblio-koha-indexdefs.xml | 433 ++++++++++++++++++-- .../unimarc/biblios/biblio-zebra-indexdefs.xsl | 379 ++++++++++++----- 2 files changed, 665 insertions(+), 147 deletions(-) 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 ceaba51..cb87466 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml +++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml @@ -243,12 +243,22 @@ Author:w Author:p - + + + Author:w + Author:p + + + + Author:w + Author:p + + Koha-Auth-Number:w Koha-Auth-Number:n - + Author:w Personal-name:w @@ -257,47 +267,111 @@ Personal-name:w Author:s - - + + Author:w Personal-name:w Author:p Personal-name:p + Personal-name:w + + + + Author:w + Personal-name:w + Author:p Personal-name:p - - + Personal-name:w + + + + Author:w + Personal-name:w + Author:p + Personal-name:p + Personal-name:w + + Koha-Auth-Number:w Koha-Auth-Number:n - - + + Author:w Personal-name:w Author:p Personal-name:p + Personal-name:w + + + + Author:w + Personal-name:w + Author:p Personal-name:p - - + Personal-name:w + + + + Author:w + Personal-name:w + Author:p + Personal-name:p + Personal-name:w + + + + Author:w + Personal-name:w + Author:p + Personal-name:p + Personal-name:w + + Koha-Auth-Number:w Koha-Auth-Number:n - - + + Author:w Personal-name:w Author:p Personal-name:p + Personal-name:w + + + + Author:w + Personal-name:w + Author:p Personal-name:p - - + Personal-name:w + + + + Author:w + Personal-name:w + Author:p + Personal-name:p + Personal-name:w + + + + Author:w + Personal-name:w + Author:p + Personal-name:p + Personal-name:w + + Koha-Auth-Number:w Koha-Auth-Number:n - - + + Author:w Author-name-corporate:w Author-name-conference:w @@ -308,14 +382,157 @@ Author-name-conference:p Corporate-name:p Conference-name:p - - + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + Koha-Auth-Number:w Koha-Auth-Number:n - - + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + Author:w Author-name-corporate:w Author-name-conference:w @@ -327,13 +544,52 @@ Corporate-name:p Conference-name:p - + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + Koha-Auth-Number:w Koha-Auth-Number:n - - + + Author:w Author-name-corporate:w Author-name-conference:w @@ -344,57 +600,148 @@ Author-name-conference:p Corporate-name:p Conference-name:p - - + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + + + Author:w + Author-name-corporate:w + Author-name-conference:w + Corporate-name:w + Conference-name:w + Author:p + Author-name-corporate:p + Author-name-conference:p + Corporate-name:p + Conference-name:p + + Koha-Auth-Number:w Koha-Auth-Number:n - - + + Author:w Author:p - + Koha-Auth-Number:w Koha-Auth-Number:n - - + + Author:w Author:p - - + + Koha-Auth-Number:w Koha-Auth-Number:n - - + + Author:w Author:p - - + + Koha-Auth-Number:w Koha-Auth-Number:n - - + + Author:w Author:p - - + + Koha-Auth-Number:w Koha-Auth-Number:n - - + + Author:w Author:p - + Title:w 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 f1e82e3..9a0ec87 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl +++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl @@ -525,6 +525,22 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + + + + + + + + + + @@ -540,6 +556,27 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + + + + + + + + + + + + + + + @@ -549,6 +586,34 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -558,6 +623,34 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -567,6 +660,55 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -576,6 +718,55 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -585,6 +776,62 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -603,6 +850,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + @@ -612,6 +866,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + @@ -621,6 +882,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + @@ -630,6 +898,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + + + + + + + @@ -2048,45 +2323,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2113,19 +2349,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - - - - - - - @@ -2139,58 +2362,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 1.7.9.5