From 6e0ee894a70bbe7124e35aa9b94dc54b2820ee69 Mon Sep 17 00:00:00 2001
From: Barton Chittenden <barton@bywatersolutions.com>
Date: Thu, 10 Jul 2014 09:54:56 -0400
Subject: [PATCH] Add Zebra index "Other-control-number" covering MARC21 035$a, 035$z and 035 (entire tag)

http://bugs.koha-community.org/show_bug.cgi?id=6499
---
 C4/Search.pm                                       |    1 +
 etc/zebradb/biblios/etc/bib1.att                   |    3 +-
 etc/zebradb/ccl.properties                         |    3 ++
 .../marc21/biblios/biblio-koha-indexdefs.xml       |   14 +++++++++-
 .../marc21/biblios/biblio-zebra-indexdefs.xsl      |   29 ++++++++++++++++++++
 etc/zebradb/marc_defs/marc21/biblios/record.abs    |    4 ++-
 6 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/C4/Search.pm b/C4/Search.pm
index f93dd15..550d0d7 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1187,6 +1187,7 @@ sub getIndexes{
                     'notes',
                     'ns',
                     'nt',
+                    'Other-control-number',
                     'pb',
                     'Personal-name',
                     'Personal-name-heading',
diff --git a/etc/zebradb/biblios/etc/bib1.att b/etc/zebradb/biblios/etc/bib1.att
index ed8c64b..79cdfc9 100644
--- a/etc/zebradb/biblios/etc/bib1.att
+++ b/etc/zebradb/biblios/etc/bib1.att
@@ -191,7 +191,8 @@ att 1207    Instruments-total-number
 att 1208    Instruments-distint-number
 att 1209    Identifier-URN
 att 1210    Sears-Subject-Heading
-att 1211    OCLC-Number
+#att 1211    OCLC-Number
+att 1211    Other-control-number
 att 1212    Composition
 att 1213    Intellectual-level
 att 1214    EAN
diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties
index 99e3498..57f5118 100644
--- a/etc/zebradb/ccl.properties
+++ b/etc/zebradb/ccl.properties
@@ -361,6 +361,9 @@ Date/time-last-modified       1=1012
 #                           academic degree.
 Dissertation-information 1=1056
 
+#OCLC Number          1211  OCLC Number                     MARC21 035
+Other-control-number 1=1211
+
 #EAN                  1214  European article number         UNIMARC 073
 EAN 1=1214
 ean EAN
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 8ad9db1..459eeb0 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
+++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
@@ -165,7 +165,19 @@
   <index_data_field tag="034">
     <target_index>Map-scale:w</target_index>
   </index_data_field>
-  <!--record.abs line 68: melm 037        Identifier-standard,Stock-number-->
+  <!--record.abs line 75: melm 035$a      Other-control-number-->
+  <index_subfields tag="035" subfields="a">
+    <target_index>Other-control-number:w</target_index>
+  </index_subfields>
+  <!--record.abs line 76: melm 035$z      Other-control-number-->
+  <index_subfields tag="035" subfields="z">
+    <target_index>Other-control-number:w</target_index>
+  </index_subfields>
+  <!--record.abs line 77: melm 035        Other-control-number-->
+  <index_data_field tag="035">
+    <target_index>Other-control-number:w</target_index>
+  </index_data_field>
+  <!--record.abs line 78: melm 037        Identifier-standard,Stock-number-->
   <index_data_field tag="037">
     <target_index>Identifier-standard:w</target_index>
     <target_index>Stock-number: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 a0f68f1..039d312 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
+++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
@@ -159,6 +159,22 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
       </xslo:if>
     </xslo:for-each>
   </xslo:template>
+  <xslo:template mode="index_subfields" match="marc:datafield[@tag='035']">
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('a', @code)">
+        <z:index name="Other-control-number:w">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('z', @code)">
+        <z:index name="Other-control-number:w">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
+  </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='041']">
     <xslo:for-each select="marc:subfield">
       <xslo:if test="contains('a', @code)">
@@ -1527,6 +1543,19 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
       <xslo:value-of select="normalize-space($raw_heading)"/>
     </z:index>
   </xslo:template>
+  <xslo:template mode="index_data_field" match="marc:datafield[@tag='035']">
+    <z:index name="Other-control-number:w">
+      <xslo:variable name="raw_heading">
+        <xslo:for-each select="marc:subfield">
+          <xslo:if test="position() &gt; 1">
+            <xslo:value-of select="substring(' ', 1, 1)"/>
+          </xslo:if>
+          <xslo:value-of select="."/>
+        </xslo:for-each>
+      </xslo:variable>
+      <xslo:value-of select="normalize-space($raw_heading)"/>
+    </z:index>
+  </xslo:template>
   <xslo:template mode="index_data_field" match="marc:datafield[@tag='037']">
     <z:index name="Identifier-standard:w Stock-number:w">
       <xslo:variable name="raw_heading">
diff --git a/etc/zebradb/marc_defs/marc21/biblios/record.abs b/etc/zebradb/marc_defs/marc21/biblios/record.abs
index dcb3cad..a9d1172 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/record.abs
+++ b/etc/zebradb/marc_defs/marc21/biblios/record.abs
@@ -72,7 +72,9 @@ melm 028        Identifier-publisher-for-music,Identifier-standard
 melm 030        CODEN,Identifier-standard
 #melm 033       Date
 melm 034        Map-scale
-#melm 035       Local-number,Identifier-standard
+melm 035$a      Other-control-number
+melm 035$z      Other-control-number
+melm 035        Other-control-number
 melm 037        Identifier-standard,Stock-number
 melm 040        Code-institution,Record-source
 melm 041$a      ln,ln-audio:w
-- 
1.7.2.5