[Koha-patches] [PATCH] Bug 8653 remove erroneous whitespace blocking indexing

Colin Campbell colin.campbell at ptfs-europe.com
Thu Aug 16 19:27:58 CEST 2012


The superfluous whitespace after the definition of subject
tag $9s is causing an error when carried over into dom config
files so that the authority links fail to index

Also removed the (harmless) trailing space in the equivalent
Unimarc files

A good editor and git can help in not creating excess whitespace
---
 .../marc21/biblios/biblio-koha-indexdefs.xml       | 22 ++++++++--------
 etc/zebradb/marc_defs/marc21/biblios/record.abs    | 30 +++++++++++-----------
 .../unimarc/biblios/biblio-koha-indexdefs.xml      |  8 +++---
 etc/zebradb/marc_defs/unimarc/biblios/record.abs   | 10 ++++----
 4 files changed, 35 insertions(+), 35 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 544b2ee..9219000 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
+++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
@@ -662,7 +662,7 @@
   </index_data_field>
   <!--record.abs line 177: melm 650$9      Koha-Auth-Number    -->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="650" subfields="9">
-    <target_index>Koha-Auth-Number    :w</target_index>
+    <target_index>Koha-Auth-Number:w</target_index>
   </index_subfields>
   <!--record.abs line 178: melm 650        Subject,Subject:p-->
   <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="650">
@@ -671,7 +671,7 @@
   </index_data_field>
   <!--record.abs line 179: melm 651$9      Koha-Auth-Number    -->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="651" subfields="9">
-    <target_index>Koha-Auth-Number    :w</target_index>
+    <target_index>Koha-Auth-Number:w</target_index>
   </index_subfields>
   <!--record.abs line 180: melm 651        Name-geographic,Subject,Subject:p-->
   <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="651">
@@ -681,11 +681,11 @@
   </index_data_field>
   <!--record.abs line 181: melm 652$9      Koha-Auth-Number    -->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="652" subfields="9">
-    <target_index>Koha-Auth-Number    :w</target_index>
+    <target_index>Koha-Auth-Number:w</target_index>
   </index_subfields>
   <!--record.abs line 183: melm 653$9      Koha-Auth-Number    -->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="653" subfields="9">
-    <target_index>Koha-Auth-Number    :w</target_index>
+    <target_index>Koha-Auth-Number:w</target_index>
   </index_subfields>
   <!--record.abs line 184: melm 653        Subject,Subject:p-->
   <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="653">
@@ -694,7 +694,7 @@
   </index_data_field>
   <!--record.abs line 185: melm 654$9      Koha-Auth-Number    -->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="654" subfields="9">
-    <target_index>Koha-Auth-Number    :w</target_index>
+    <target_index>Koha-Auth-Number:w</target_index>
   </index_subfields>
   <!--record.abs line 186: melm 654        Subject,Subject:p-->
   <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="654">
@@ -703,7 +703,7 @@
   </index_data_field>
   <!--record.abs line 187: melm 655$9      Koha-Auth-Number    -->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="655" subfields="9">
-    <target_index>Koha-Auth-Number    :w</target_index>
+    <target_index>Koha-Auth-Number:w</target_index>
   </index_subfields>
   <!--record.abs line 188: melm 655        Subject,Subject:p-->
   <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="655">
@@ -712,7 +712,7 @@
   </index_data_field>
   <!--record.abs line 189: melm 656$9      Koha-Auth-Number    -->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="656" subfields="9">
-    <target_index>Koha-Auth-Number    :w</target_index>
+    <target_index>Koha-Auth-Number:w</target_index>
   </index_subfields>
   <!--record.abs line 190: melm 656        Subject,Subject:p-->
   <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="656">
@@ -721,7 +721,7 @@
   </index_data_field>
   <!--record.abs line 191: melm 657$9      Koha-Auth-Number    -->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="657" subfields="9">
-    <target_index>Koha-Auth-Number    :w</target_index>
+    <target_index>Koha-Auth-Number:w</target_index>
   </index_subfields>
   <!--record.abs line 192: melm 657        Subject,Subject:p-->
   <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="657">
@@ -756,7 +756,7 @@
   </index_data_field>
   <!--record.abs line 197: melm 690$9      Koha-Auth-Number    -->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="690" subfields="9">
-    <target_index>Koha-Auth-Number    :w</target_index>
+    <target_index>Koha-Auth-Number:w</target_index>
   </index_subfields>
   <!--record.abs line 198: melm 690        Subject,Subject:p-->
   <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="690">
@@ -810,7 +810,7 @@
   </index_subfields>
   <!--record.abs line 211: melm 710$9      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:w</target_index>
   </index_subfields>
   <!--record.abs line 212: melm 710        Author,Author:p,Corporate-name,Name-->
   <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="710">
@@ -831,7 +831,7 @@
   </index_subfields>
   <!--record.abs line 216: melm 711$9      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:w</target_index>
   </index_subfields>
   <!--record.abs line 218: melm 711        Author,Author:p,Author-name-corporate,Name,Conference-name-->
   <index_data_field xmlns="http://www.koha-community.org/schemas/index-defs" tag="711">
diff --git a/etc/zebradb/marc_defs/marc21/biblios/record.abs b/etc/zebradb/marc_defs/marc21/biblios/record.abs
index 93f96b2..0f8360e 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/record.abs
+++ b/etc/zebradb/marc_defs/marc21/biblios/record.abs
@@ -182,27 +182,27 @@ melm 630$n      Thematic-number,Subject,Subject:p
 melm 630$r      Music-key,Subject,Subject:p
 melm 630$9      Koha-Auth-Number
 melm 630        Subject,Subject:p
-melm 650$9      Koha-Auth-Number    
+melm 650$9      Koha-Auth-Number
 melm 650        Subject,Subject:p
-melm 651$9      Koha-Auth-Number    
+melm 651$9      Koha-Auth-Number
 melm 651        Name-geographic,Subject,Subject:p
-melm 652$9      Koha-Auth-Number    
+melm 652$9      Koha-Auth-Number
 #melm 652       subject-heading,subject-heading:p
-melm 653$9      Koha-Auth-Number    
+melm 653$9      Koha-Auth-Number
 melm 653        Subject,Subject:p
-melm 654$9      Koha-Auth-Number    
+melm 654$9      Koha-Auth-Number
 melm 654        Subject,Subject:p
-melm 655$9      Koha-Auth-Number    
+melm 655$9      Koha-Auth-Number
 melm 655        Subject,Subject:p
-melm 656$9      Koha-Auth-Number    
+melm 656$9      Koha-Auth-Number
 melm 656        Subject,Subject:p
-melm 657$9      Koha-Auth-Number    
+melm 657$9      Koha-Auth-Number
 melm 657        Subject,Subject:p
-melm 658$a	curriculum:w,curriculum:p,Subject,Subject:p
-melm 658$b	curriculum:w,curriculum:p,Subject,Subject:p
-melm 658$c	curriculum:w,curriculum:p,Subject,Subject:p
+melm 658$a      curriculum:w,curriculum:p,Subject,Subject:p
+melm 658$b      curriculum:w,curriculum:p,Subject,Subject:p
+melm 658$c      curriculum:w,curriculum:p,Subject,Subject:p
 melm 658        Subject,Subject:p
-melm 690$9      Koha-Auth-Number    
+melm 690$9      Koha-Auth-Number
 melm 690        Subject,Subject:p
 
 melm 700$9      Cross-Reference,Koha-Auth-Number
@@ -216,12 +216,12 @@ melm 700        Author,Author:p,Author-name-personal,Name,Editor,Personal-name
 melm 710$t      Author-title,Name-and-title,Title,Title-uniform
 #melm 710$a     author,author:p,Name-and-title
 melm 710$a      Name-and-title
-melm 710$9      Koha-Auth-Number    
+melm 710$9      Koha-Auth-Number
 melm 710        Author,Author:p,Corporate-name,Name
 melm 711$a      Name-and-title
 #melm 711$t     author,Author-title,Title,Title-uniform
 melm 711$t      Author-title,Title,Title-uniform
-melm 711$9      Koha-Auth-Number    
+melm 711$9      Koha-Auth-Number
 #melm 711       author,Author-name-corporate,Name,Conference-name
 melm 711        Author,Author:p,Author-name-corporate,Name,Conference-name
 melm 730$n      Thematic-number
@@ -291,7 +291,7 @@ melm 942$m      cn-suffix
 melm 952$0      withdrawn:n,withdrawn:w
 melm 952$1      lost,lost:n
 melm 952$2      classification-source
-melm 952$3      materials-specified 
+melm 952$3      materials-specified
 melm 952$4      damaged:n,damaged:w
 melm 952$5      restricted:n,restricted:w
 melm 952$6      cn-sort:n,cn-sort:s
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 16f434f..6870469 100644
--- a/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
+++ b/etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml
@@ -358,7 +358,7 @@
   <!--record.abs line 142: melm 225$e      Title-series,Title-series:p -->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="225" subfields="e">
     <target_index>Title-series:w</target_index>
-    <target_index>Title-series:p </target_index>
+    <target_index>Title-series:p</target_index>
   </index_subfields>
   <!--record.abs line 144: melm 225$f      Author,Author:p,Name-and-title,Name-and-title:p-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="225" subfields="f">
@@ -370,17 +370,17 @@
   <!--record.abs line 146: melm 225$h      Title-series,Title-series:p -->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="225" subfields="h">
     <target_index>Title-series:w</target_index>
-    <target_index>Title-series:p </target_index>
+    <target_index>Title-series:p</target_index>
   </index_subfields>
   <!--record.abs line 148: melm 225$i      Title-series,Title-series:p -->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="225" subfields="i">
     <target_index>Title-series:w</target_index>
-    <target_index>Title-series:p </target_index>
+    <target_index>Title-series:p</target_index>
   </index_subfields>
   <!--record.abs line 150: melm 225$v      Title-series,Title-series:p -->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="225" subfields="v">
     <target_index>Title-series:w</target_index>
-    <target_index>Title-series:p </target_index>
+    <target_index>Title-series:p</target_index>
   </index_subfields>
   <!--record.abs line 151: melm 225$x      ISSN-->
   <index_subfields xmlns="http://www.koha-community.org/schemas/index-defs" tag="225" subfields="x">
diff --git a/etc/zebradb/marc_defs/unimarc/biblios/record.abs b/etc/zebradb/marc_defs/unimarc/biblios/record.abs
index a30d10f..dcbc7a1 100644
--- a/etc/zebradb/marc_defs/unimarc/biblios/record.abs
+++ b/etc/zebradb/marc_defs/unimarc/biblios/record.abs
@@ -138,16 +138,16 @@ melm 215        Extent
 #Series
 melm 225$a      Title-series,Title-series:p
 melm 225$d      Title-series,Title-series:p
-#SubTitle
-melm 225$e      Title-series,Title-series:p 
+#SubTit
+melm 225$e      Title-series,Title-series:p
 #Authors
 melm 225$f      Author,Author:p,Name-and-title,Name-and-title:p
 #Part-Title
-melm 225$h      Title-series,Title-series:p 
+melm 225$h      Title-series,Title-series:p
 #Part Number
-melm 225$i      Title-series,Title-series:p 
+melm 225$i      Title-series,Title-series:p
 #Volume
-melm 225$v      Title-series,Title-series:p 
+melm 225$v      Title-series,Title-series:p
 melm 225$x      ISSN
 
 melm 230$a      Electronic-ressource
-- 
1.7.12.rc2.18.g61b472e



More information about the Koha-patches mailing list