From d535ad27f006d1e0637d14aafe4e9b4e2686f750 Mon Sep 17 00:00:00 2001
From: Mason James <mtj@kohaaloha.com>
Date: Tue, 27 Oct 2015 13:17:21 +1300
Subject: [PATCH] Bug 15048 - subject/genre (650/655) searches fail on searches
 with $x 'General subdivision' subfield values
Content-Type: text/plain; charset="utf-8"

to test...

1/ define both a 655$a *and* 655$x value in a bib, save, reindex

2/ in opac-detail.pl click bib's genre/form url, the search should FAIL to return a result (BAD!) :/

3/ apply patch

4/ copy updated files to your live zebradb dir (or build/install a debian package)

$ sudo cp ./etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml \
  /etc/koha/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml

$ sudo cp etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl \
  /etc/koha/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl

5/ run a full zebra reindex

6/ in opac-detail.pl click bib's genre/form url, the search should return a result (GOOD!) :0)
---
 etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml  | 4 ++--
 etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 101f6ff..f82afe2 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
+++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
@@ -720,8 +720,8 @@
     <target_index>Subject:w</target_index>
     <target_index>Subject:p</target_index>
   </index_data_field>
-  <!--melm 655$a      Index-term-genre    -->
-  <index_subfields tag="655" subfields="a">
+  <!--melm 655$ax      Index-term-genre    -->
+  <index_subfields tag="655" subfields="ax">
     <target_index>Index-term-genre:w</target_index>
     <target_index>Index-term-genre:p</target_index>
     <target_index>Subject:w</target_index>
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 3dd627f..c69981d 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
+++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
@@ -621,7 +621,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
   </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='655']">
     <xslo:for-each select="marc:subfield">
-      <xslo:if test="contains('a', @code)">
+      <xslo:if test="contains('ax', @code)">
         <z:index name="Index-term-genre:w Index-term-genre:p Subject:w Subject:p">
           <xslo:value-of select="."/>
         </z:index>
-- 
2.1.4