From 4a6596e3d21457d6eb236a42b76b69a8a384ad2c Mon Sep 17 00:00:00 2001
From: Jesse Weaver <pianohacker@gmail.com>
Date: Mon, 10 Mar 2014 14:18:20 +0100
Subject: [PATCH] Bug 10486 - QA followup: fix issues with pazpar2
 configuration

---
 etc/pazpar2/pazpar2.xml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/etc/pazpar2/pazpar2.xml b/etc/pazpar2/pazpar2.xml
index a3a3404..9969581 100644
--- a/etc/pazpar2/pazpar2.xml
+++ b/etc/pazpar2/pazpar2.xml
@@ -7,29 +7,26 @@
     <settings src="__PAZPAR2_CONF_DIR__/generic-settings.xml"/>
 
     <relevance>
-      <icu_chain id="relevance" locale="el">
-	<normalize rule="[:Control:] Any-Remove"/>
+      <icu_chain id="relevance" locale="en">
+	<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"/>
+      <icu_chain id="sort" locale="en">
+	<transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
 	<casemap rule="l"/>
-	<sortkey/>
       </icu_chain>
     </sort>
     
     <mergekey>
-      <icu_chain id="mergekey" locale="el">
+      <icu_chain id="mergekey" locale="en">
 	<tokenize rule="l"/>
-	<normalize rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
+	<transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]] Remove"/>
 	<casemap rule="l"/>
-	<index/>
       </icu_chain>
     </mergekey>
     
-- 
1.8.5.3