From 15d16c5273231190e1d9efcce2a2c7ed34f69207 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Thu, 20 Aug 2015 11:29:01 +0200
Subject: [PATCH] Bug 6499: [QA Follow-up] Trivial adjustments
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Removes commented line from bib1.att.
Adjust OCLC-number to Other-control-number in comment of ccl properties.
No need to explicitly add 035$a and $z if you index 035 completely in
record.abs as well as biblio-koha-indexdefs.xml.
Rerun koha-indexdefs-to-zebra.xsl on index defs.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 5b4259be9c237c7773f6af9f6c83894718be603d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 etc/zebradb/biblios/etc/bib1.att                 |  1 -
 etc/zebradb/ccl.properties                       |  2 +-
 .../marc21/biblios/biblio-koha-indexdefs.xml     | 10 +---------
 .../marc21/biblios/biblio-zebra-indexdefs.xsl    | 16 ----------------
 etc/zebradb/marc_defs/marc21/biblios/record.abs  |  2 --
 5 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/etc/zebradb/biblios/etc/bib1.att b/etc/zebradb/biblios/etc/bib1.att
index a88b2ce828..5ebc316615 100644
--- a/etc/zebradb/biblios/etc/bib1.att
+++ b/etc/zebradb/biblios/etc/bib1.att
@@ -191,7 +191,6 @@ 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    Other-control-number
 att 1212    Composition
 att 1213    Intellectual-level
diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties
index 24f192e4b6..3ec1363754 100644
--- a/etc/zebradb/ccl.properties
+++ b/etc/zebradb/ccl.properties
@@ -364,7 +364,7 @@ dtlm Date/time-last-modified
 Dissertation-information 1=1056
 diss Dissertation-information
 
-#OCLC Number          1211  OCLC Number                     MARC21 035
+#Other-control-number 1211  Other control number            MARC21 035
 Other-control-number 1=1211
 
 #EAN                  1214  European article number         UNIMARC 073
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 b3877ddcd9..38f91a2103 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
+++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
@@ -180,15 +180,7 @@
   <index_data_field tag="034">
     <target_index>Map-scale:w</target_index>
   </index_data_field>
-  <!--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-->
+  <!--record.abs line 75: melm 035        Other-control-number-->
   <index_data_field tag="035">
     <target_index>Other-control-number:w</target_index>
   </index_data_field>
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 e6dc25bae7..dd2a7602e3 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
+++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
@@ -191,22 +191,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
       </xslo:for-each>
     </xslo:if>
   </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)">
diff --git a/etc/zebradb/marc_defs/marc21/biblios/record.abs b/etc/zebradb/marc_defs/marc21/biblios/record.abs
index 1c2b269db3..4882485aec 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/record.abs
+++ b/etc/zebradb/marc_defs/marc21/biblios/record.abs
@@ -72,8 +72,6 @@ melm 028        Identifier-publisher-for-music,Identifier-standard
 melm 030        CODEN,Identifier-standard
 #melm 033       Date
 melm 034        Map-scale
-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
-- 
2.39.5