From f2123ceb6735d128e85dc7679368cc80ede66a2e Mon Sep 17 00:00:00 2001 From: Jared Camins-Esakov Date: Thu, 4 Oct 2012 08:52:48 -0400 Subject: [PATCH] Bug 8665: DOM indexing fails to index some bib records Use a user-specified field for z:id. This patch also fixes an excess space before the index in the MARC21 biblio index definitions, which someone fixed in the generated file but not in the source file it should have been fixed in. Signed-off-by: Chris Cormack --- .../marc_defs/marc21/authorities/authority-koha-indexdefs.xml | 1 + .../marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl | 6 +++--- etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml | 3 ++- etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl | 6 ++++-- etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml | 1 + etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl | 6 ++++-- etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl | 6 ++++-- 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml b/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml index 4599728..5a34eb2 100644 --- a/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml +++ b/etc/zebradb/marc_defs/marc21/authorities/authority-koha-indexdefs.xml @@ -6,6 +6,7 @@ run the following command: authority-zebra-indexdefs.xsl` --> + marc:controlfield[@tag='001'] v x diff --git a/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl b/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl index 1bafa16..5c80c2c 100644 --- a/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl +++ b/etc/zebradb/marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl @@ -27,10 +27,10 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + - + @@ -1122,7 +1122,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + diff --git a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml index 9219000..14443d6 100644 --- a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml +++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml @@ -1,6 +1,7 @@ + marc:datafield[@tag='999']/marc:subfield[@code='c'] llength:w @@ -1124,7 +1125,7 @@ - materials-specified :w + materials-specified:w diff --git a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl b/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl index 06b7882..14f299e 100644 --- a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl +++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl @@ -13,6 +13,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + @@ -26,15 +27,16 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + - + + 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 6870469..8eecf1c 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml +++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml @@ -1,5 +1,6 @@ + marc:controlfield[@tag='001'] Local-number: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 feeda35..46e190f 100644 --- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl +++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl @@ -13,6 +13,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) + @@ -26,15 +27,16 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + - + + diff --git a/etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl b/etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl index 2316d3f..47c47a7 100644 --- a/etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl +++ b/etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl @@ -49,9 +49,11 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml) - + + normalize-space() + - + -- 1.7.10.4