From 0eab023d5c5ee32ecbb9c04f7f7c3c09dd4d5ac0 Mon Sep 17 00:00:00 2001
From: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Date: Mon, 11 Feb 2013 10:46:20 +0100
Subject: [PATCH 2/2] Bug 9352 : More specific indexing of UNIMARC 7XX fields and 511 (DOM)
Content-Type: text/plain; charset="utf-8"

2d patch, for DOM indexing
Rebased on 20 Aug 2014

Same changes as in GRS-1 patch, with 2 small additions :
- I take the occasion for indexing the 511 field (I don't know why it was omitted)
- index 710$a and 720$a in Author:s as well as 700$a (seems logical)

(biblio-zebra-indexdefs.xsl is made from biblio-koha-indexdefs.xml with xsltproc)

Same test as first patch :
Testing :
a/ Create a record with some values. for example:
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
511$a falsetitle

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
Search ti:falsetitle
=> no results

c/ Apply the patch
d/ copy the 2 modified files into your zebra configuration directory
e/ Rebuild Zebra with ./misc/migration_tools/rebuild_zebra.pl -b -x -v -reset

f/ 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
Search ti:falsetitle
=> 1 result

---
 .../unimarc/biblios/biblio-koha-indexdefs.xml      |  125 ++++++-----
 .../unimarc/biblios/biblio-zebra-indexdefs.xsl     |  228 +++++++++-----------
 2 files changed, 179 insertions(+), 174 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 e70a12c..8b7b5a4 100644
--- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
+++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
@@ -290,17 +290,22 @@
     <target_index>Graphics-support:w</target_index>
   </index_subfields>
   <!--==== AUTHOR ====-->
-  <!--200$fg-->
+  <!--200$fg : Main author and other authors-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="200" subfields="fg">
     <target_index>Author:w</target_index>
     <target_index>Author:p</target_index>
   </index_subfields>
-  <!--record.abs line 96: melm 700$9      Koha-Auth-Number,Koha-Auth-Number:n-->
+  <!--205$fg : Main author and other authors of the edition-->
+  <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="205" subfields="f">
+    <target_index>Author:w</target_index>
+    <target_index>Author:p</target_index>
+  </index_subfields>
+  <!--700 : Physical author (main)-->
+  <!--Do not index $f (dates),$c (additions other than dates),$p (affiliation/address),$3,$4. Index $9 only in Koha-Auth-Number. Index $a in Author:s-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="700" subfields="9">
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
-  <!--record.abs line 97: melm 700$a      Author,Personal-name,Author:p,Personal-name:p,Personal-name,Author:s-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="700" subfields="a">
     <target_index>Author:w</target_index>
     <target_index>Personal-name:w</target_index>
@@ -309,47 +314,46 @@
     <target_index>Personal-name:w</target_index>
     <target_index>Author:s</target_index>
   </index_subfields>
-  <!--record.abs line 98: melm 700        Author,Personal-name,Author:p,Personal-name:p,Personal-name:p-->
-  <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="700">
+  <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="700" subfields="bdg">
     <target_index>Author:w</target_index>
     <target_index>Personal-name:w</target_index>
     <target_index>Author:p</target_index>
     <target_index>Personal-name:p</target_index>
-    <target_index>Personal-name:p</target_index>
-  </index_data_field>
-  <!--record.abs line 99: melm 701$9      Koha-Auth-Number,Koha-Auth-Number:n-->
+    <target_index>Personal-name:w</target_index>
+  </index_subfields>
+  <!--701 : Physical author (other)-->
+  <!--Index $9 only in Koha-Auth-Number-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="701" subfields="9">
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
-  <!--record.abs line 100: melm 701        Author,Personal-name,Author:p,Personal-name:p,Personal-name:p-->
-  <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="701">
+  <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="701" subfields="abdg">
     <target_index>Author:w</target_index>
     <target_index>Personal-name:w</target_index>
     <target_index>Author:p</target_index>
     <target_index>Personal-name:p</target_index>
-    <target_index>Personal-name:p</target_index>
-  </index_data_field>
-  <!--record.abs line 101: melm 702$9      Koha-Auth-Number,Koha-Auth-Number:n-->
+    <target_index>Personal-name:w</target_index>
+  </index_subfields>
+  <!--702 : Physical author (secondary)-->
+  <!--Index $9 only in Koha-Auth-Number-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="702" subfields="9">
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
-  <!--record.abs line 102: melm 702        Author,Personal-name,Author:p,Personal-name:p,Personal-name:p-->
-  <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="702">
+  <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="702" subfields="abdg">
     <target_index>Author:w</target_index>
     <target_index>Personal-name:w</target_index>
     <target_index>Author:p</target_index>
     <target_index>Personal-name:p</target_index>
-    <target_index>Personal-name:p</target_index>
-  </index_data_field>
-  <!--record.abs line 105: melm 710$9        Koha-Auth-Number,Koha-Auth-Number:n-->
+    <target_index>Personal-name:w</target_index>
+  </index_subfields>
+  <!--710 : Collective author (main)-->
+  <!--Do not index $p (affiliation/address),$3,$4. Index $a in Author:s. Index $9 only in Koha-Auth-Number-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="710" subfields="9">
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
-  <!--record.abs line 106: melm 710    Author,Author-name-corporate,Author-name-conference,Corporate-name,Conference-name,Author:p,Author-name-corporate:p,Author-name-conference:p,Corporate-name:p,Conference-name:p-->
-  <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="710">
+  <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="710" subfields="a">
     <target_index>Author:w</target_index>
     <target_index>Author-name-corporate:w</target_index>
     <target_index>Author-name-conference:w</target_index>
@@ -360,14 +364,27 @@
     <target_index>Author-name-conference:p</target_index>
     <target_index>Corporate-name:p</target_index>
     <target_index>Conference-name:p</target_index>
-  </index_data_field>
-  <!--record.abs line 107: melm 711$9        Koha-Auth-Number,Koha-Auth-Number:n-->
+    <target_index>Author:s</target_index>
+  </index_subfields>
+  <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="710" subfields="bcdefgh">
+    <target_index>Author:w</target_index>
+    <target_index>Author-name-corporate:w</target_index>
+    <target_index>Author-name-conference:w</target_index>
+    <target_index>Corporate-name:w</target_index>
+    <target_index>Conference-name:w</target_index>
+    <target_index>Author:p</target_index>
+    <target_index>Author-name-corporate:p</target_index>
+    <target_index>Author-name-conference:p</target_index>
+    <target_index>Corporate-name:p</target_index>
+    <target_index>Conference-name:p</target_index>
+  </index_subfields>
+  <!--711 : Collective author (other)-->
+  <!--Index $9 only in Koha-Auth-Number-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="711" subfields="9">
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
-  <!--record.abs line 108: melm 711    Author,Author-name-corporate,Author-name-conference,Corporate-name,Conference-name,Author:p,Author-name-corporate:p,Author-name-conference:p,Corporate-name:p,Conference-name:p-->
-  <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="711">
+  <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="711" subfields="abcdefgh">
     <target_index>Author:w</target_index>
     <target_index>Author-name-corporate:w</target_index>
     <target_index>Author-name-conference:w</target_index>
@@ -378,14 +395,14 @@
     <target_index>Author-name-conference:p</target_index>
     <target_index>Corporate-name:p</target_index>
     <target_index>Conference-name:p</target_index>
-  </index_data_field>
-  <!--record.abs line 110: melm 712$9        Koha-Auth-Number,Koha-Auth-Number:n-->
+  </index_subfields>
+  <!--712 : Collective author (secondary)-->
+  <!--Index $9 only in Koha-Auth-Number-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="712" subfields="9">
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
-  <!--record.abs line 111: melm 712    Author,Author-name-corporate,Author-name-conference,Corporate-name,Conference-name,Author:p,Author-name-corporate:p,Author-name-conference:p,Corporate-name:p,Conference-name:p-->
-  <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="712">
+  <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="712" subfields="abcdefgh">
     <target_index>Author:w</target_index>
     <target_index>Author-name-corporate:w</target_index>
     <target_index>Author-name-conference:w</target_index>
@@ -396,57 +413,59 @@
     <target_index>Author-name-conference:p</target_index>
     <target_index>Corporate-name:p</target_index>
     <target_index>Conference-name:p</target_index>
-  </index_data_field>
-  <!--record.abs line 147: melm 716$9        Koha-Auth-Number,Koha-Auth-Number:n-->
+  </index_subfields>
+  <!--716$a : Trademark-->
+  <!--Do not index $f (dates),$c (additions other than dates),$3,$4. Index $9 only in Koha-Auth-Number-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="716" subfields="9">
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
-  <!--record.abs line 148: melm 716    Author:w,Author:p-->
-  <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="716">
+  <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="716" subfields="a">
     <target_index>Author:w</target_index>
     <target_index>Author:p</target_index>
   </index_data_field>
-  <!--record.abs line 151: melm 720$9        Koha-Auth-Number,Koha-Auth-Number:n-->
+  <!--720$a : Family (main)-->
+  <!--Index $9 only in Koha-Auth-Number-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="720" subfields="9">
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
-  <!--record.abs line 152: melm 720    Author:w,Author:p-->
-  <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="720">
+  <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="720" subfields="a">
     <target_index>Author:w</target_index>
     <target_index>Author:p</target_index>
-  </index_data_field>
-  <!--record.abs line 153: melm 721$9        Koha-Auth-Number,Koha-Auth-Number:n-->
+    <target_index>Author:s</target_index>
+  </index_subfields>
+  <!--721$a : Family (other)-->
+  <!--Index $9 only in Koha-Auth-Number-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="721" subfields="9">
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
-  <!--record.abs line 154: melm 721    Author:w,Author:p-->
-  <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="721">
+  <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="721" subfields="a">
     <target_index>Author:w</target_index>
     <target_index>Author:p</target_index>
-  </index_data_field>
-  <!--record.abs line 155: melm 722$9        Koha-Auth-Number,Koha-Auth-Number:n-->
+  </index_subfields>
+  <!--722$a : Family (secondary)-->
+  <!--Index $9 only in Koha-Auth-Number-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="722" subfields="9">
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
-  <!--record.abs line 156: melm 722    Author:w,Author:p-->
-  <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="722">
+  <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="722" subfields="a">
     <target_index>Author:w</target_index>
     <target_index>Author:p</target_index>
-  </index_data_field>
-  <!--record.abs line 159: melm 730$9        Koha-Auth-Number,Koha-Auth-Number:n-->
+  </index_subfields>
+  <!--730$a : Name-responsabily Author-->
+  <!--Do not index $f (dates),$3,$4. Index $9 only in Koha-Auth-Number-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="730" subfields="9">
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
-  <!--record.abs line 160: melm 730    Author:w,Author:p-->
-  <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="730">
+  <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="730" subfields="a">
     <target_index>Author:w</target_index>
     <target_index>Author:p</target_index>
-  </index_data_field>
+  </index_subfields>
+  <!--740-742 = uniform and conventional headings for legal and religious texts. Use not recommended in France (503 used instead, see http://multimedia.bnf.fr/unimarcb_trad/B7XX-6-2011.pdf )-->
   <!--200 - Title-->
   <!--Title-cover is used for relevant sorting-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="200" subfields="aei">
@@ -972,6 +991,11 @@
     <target_index>Koha-Auth-Number:w</target_index>
     <target_index>Koha-Auth-Number:n</target_index>
   </index_subfields>
+  <!--511$9    Koha-Auth-Number,Koha-Auth-Number:n-->
+  <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="511" subfields="9">
+    <target_index>Koha-Auth-Number:w</target_index>
+    <target_index>Koha-Auth-Number:n</target_index>
+  </index_subfields>
   <!--record.abs line 246: melm 512$9    Koha-Auth-Number,Koha-Auth-Number:n-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="512" subfields="9">
     <target_index>Koha-Auth-Number:w</target_index>
@@ -1072,6 +1096,11 @@
     <target_index>Title:w</target_index>
     <target_index>Title:p</target_index>
   </index_data_field>
+  <!--511 : False title-->
+  <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="511">
+    <target_index>Title:w</target_index>
+    <target_index>Title:p</target_index>
+  </index_data_field>
   <!--record.abs line 266: melm 512		Title,Title:p-->
   <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="512">
     <target_index>Title:w</target_index>
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 c1a41aa..91fda78 100644
--- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl
+++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-zebra-indexdefs.xsl
@@ -436,8 +436,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
         </z:index>
       </xslo:if>
     </xslo:for-each>
-  </xslo:template>
-  <xslo:template mode="index_subfields" match="marc:datafield[@tag='101']">
     <xslo:for-each select="marc:subfield">
       <xslo:if test="contains('c', @code)">
         <z:index name="language-original:w">
@@ -654,6 +652,15 @@ 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='205']">
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('f', @code)">
+        <z:index name="Author:w Author:p">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
+  </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='700']">
     <xslo:for-each select="marc:subfield">
       <xslo:if test="contains('9', @code)">
@@ -669,6 +676,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
         </z:index>
       </xslo:if>
     </xslo:for-each>
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('bdg', @code)">
+        <z:index name="Author:w Personal-name:w Author:p Personal-name:p Personal-name:w">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
   </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='701']">
     <xslo:for-each select="marc:subfield">
@@ -678,6 +692,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
         </z:index>
       </xslo:if>
     </xslo:for-each>
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('abdg', @code)">
+        <z:index name="Author:w Personal-name:w Author:p Personal-name:p Personal-name:w">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
   </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='702']">
     <xslo:for-each select="marc:subfield">
@@ -687,6 +708,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
         </z:index>
       </xslo:if>
     </xslo:for-each>
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('abdg', @code)">
+        <z:index name="Author:w Personal-name:w Author:p Personal-name:p Personal-name:w">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
   </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='710']">
     <xslo:for-each select="marc:subfield">
@@ -696,6 +724,20 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
         </z:index>
       </xslo:if>
     </xslo:for-each>
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('a', @code)">
+        <z:index name="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:s">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('bcdefgh', @code)">
+        <z:index name="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">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
   </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='711']">
     <xslo:for-each select="marc:subfield">
@@ -705,6 +747,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
         </z:index>
       </xslo:if>
     </xslo:for-each>
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('abcdefgh', @code)">
+        <z:index name="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">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
   </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='712']">
     <xslo:for-each select="marc:subfield">
@@ -714,6 +763,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
         </z:index>
       </xslo:if>
     </xslo:for-each>
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('abcdefgh', @code)">
+        <z:index name="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">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
   </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='716']">
     <xslo:for-each select="marc:subfield">
@@ -732,6 +788,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
         </z:index>
       </xslo:if>
     </xslo:for-each>
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('a', @code)">
+        <z:index name="Author:w Author:p Author:s">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
   </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='721']">
     <xslo:for-each select="marc:subfield">
@@ -741,6 +804,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
         </z:index>
       </xslo:if>
     </xslo:for-each>
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('a', @code)">
+        <z:index name="Author:w Author:p">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
   </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='722']">
     <xslo:for-each select="marc:subfield">
@@ -750,6 +820,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
         </z:index>
       </xslo:if>
     </xslo:for-each>
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('a', @code)">
+        <z:index name="Author:w Author:p">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
   </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='730']">
     <xslo:for-each select="marc:subfield">
@@ -759,6 +836,13 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
         </z:index>
       </xslo:if>
     </xslo:for-each>
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('a', @code)">
+        <z:index name="Author:w Author:p">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
   </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='208']">
     <xslo:for-each select="marc:subfield">
@@ -1532,6 +1616,15 @@ 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='511']">
+    <xslo:for-each select="marc:subfield">
+      <xslo:if test="contains('9', @code)">
+        <z:index name="Koha-Auth-Number:w Koha-Auth-Number:n">
+          <xslo:value-of select="."/>
+        </z:index>
+      </xslo:if>
+    </xslo:for-each>
+  </xslo:template>
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='512']">
     <xslo:for-each select="marc:subfield">
       <xslo:if test="contains('9', @code)">
@@ -1857,84 +1950,6 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
       </xslo:if>
     </xslo:for-each>
   </xslo:template>
-  <xslo:template mode="index_data_field" match="marc:datafield[@tag='700']">
-    <z:index name="Author:w Personal-name:w Author:p Personal-name:p Personal-name:p">
-      <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='701']">
-    <z:index name="Author:w Personal-name:w Author:p Personal-name:p Personal-name:p">
-      <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='702']">
-    <z:index name="Author:w Personal-name:w Author:p Personal-name:p Personal-name:p">
-      <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='710']">
-    <z:index name="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">
-      <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='711']">
-    <z:index name="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">
-      <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='712']">
-    <z:index name="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">
-      <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='716']">
     <z:index name="Author:w Author:p">
       <xslo:variable name="raw_heading">
@@ -1948,47 +1963,8 @@ 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='720']">
-    <z:index name="Author:w Author:p">
-      <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='721']">
-    <z:index name="Author:w Author:p">
-      <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='722']">
-    <z:index name="Author:w Author:p">
-      <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='730']">
-    <z:index name="Author:w Author:p">
+  <xslo:template mode="index_data_field" match="marc:datafield[@tag='205']">
+    <z:index name="Title:w Title:p">
       <xslo:variable name="raw_heading">
         <xslo:for-each select="marc:subfield">
           <xslo:if test="position() &gt; 1">
@@ -2000,7 +1976,7 @@ 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='205']">
+  <xslo:template mode="index_data_field" match="marc:datafield[@tag='500']">
     <z:index name="Title:w Title:p">
       <xslo:variable name="raw_heading">
         <xslo:for-each select="marc:subfield">
@@ -2013,7 +1989,7 @@ 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='500']">
+  <xslo:template mode="index_data_field" match="marc:datafield[@tag='501']">
     <z:index name="Title:w Title:p">
       <xslo:variable name="raw_heading">
         <xslo:for-each select="marc:subfield">
@@ -2026,7 +2002,7 @@ 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='501']">
+  <xslo:template mode="index_data_field" match="marc:datafield[@tag='503']">
     <z:index name="Title:w Title:p">
       <xslo:variable name="raw_heading">
         <xslo:for-each select="marc:subfield">
@@ -2039,7 +2015,7 @@ 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='503']">
+  <xslo:template mode="index_data_field" match="marc:datafield[@tag='510']">
     <z:index name="Title:w Title:p">
       <xslo:variable name="raw_heading">
         <xslo:for-each select="marc:subfield">
@@ -2052,7 +2028,7 @@ 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='510']">
+  <xslo:template mode="index_data_field" match="marc:datafield[@tag='511']">
     <z:index name="Title:w Title:p">
       <xslo:variable name="raw_heading">
         <xslo:for-each select="marc:subfield">
-- 
1.7.9.5