From 5fab9ee90ebf81c0728516b329aa8da8bb294a3a Mon Sep 17 00:00:00 2001
From: Jesse Weaver <pianohacker@gmail.com>
Date: Fri, 22 Nov 2013 14:50:07 -0700
Subject: [PATCH] Bug 10486 followup - fix pazpar2 configuration file

This removes some deprecated elements and changes the name of some
others. For an existing install, you will need to make the following
changes to your installed pazpar2.xml configuration file:

  1. Remove the <sortkey/> and <index/> tags from <relevance>, <sort>
     and <mergekey>.
  2. Change the <normalize ...> tags to <transform ...>.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
---
 etc/pazpar2/pazpar2.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/etc/pazpar2/pazpar2.xml b/etc/pazpar2/pazpar2.xml
index a3a3404..53f22db 100644
--- a/etc/pazpar2/pazpar2.xml
+++ b/etc/pazpar2/pazpar2.xml
@@ -8,28 +8,25 @@
 
     <relevance>
       <icu_chain id="relevance" locale="el">
-	<normalize rule="[:Control:] Any-Remove"/>
+	<transform rule="[:Control:] Any-Remove"/>
 	<tokenize rule="l"/>
-	<normalize rule="[[:WhiteSpace:][:Punctuation:]] Remove"/>
+	<transform rule="[[:WhiteSpace:][:Punctuation:]] Remove"/>
 	<casemap rule="l"/>
-	<index/>
       </icu_chain>
     </relevance>
 
     <sort>
       <icu_chain id="sort" locale="el">
-	<normalize rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
+	<transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
 	<casemap rule="l"/>
-	<sortkey/>
       </icu_chain>
     </sort>
     
     <mergekey>
       <icu_chain id="mergekey" locale="el">
 	<tokenize rule="l"/>
-	<normalize rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
+	<transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
 	<casemap rule="l"/>
-	<index/>
       </icu_chain>
     </mergekey>
     
-- 
1.8.4.3