From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 23 Apr 2014 09:18:54 +0000 (+0200)
Subject: Merge branch 'master' into paz-927
X-Git-Tag: v1.12.0~27
X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=a9350f938e7728f95b15e7f3b704bac9be359d57;hp=e2e42808d8ea15688b8a6cc3bd1b0f77d915b995;p=pazpar2-moved-to-github.git

Merge branch 'master' into paz-927
---

diff --git a/etc/default.xml b/etc/default.xml
index 11f6f03..66312dd 100644
--- a/etc/default.xml
+++ b/etc/default.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <service  xmlns="http://www.indexdata.com/pazpar2/1.0">
   <timeout session="60" z3950_operation="30" z3950_session="180"/>
-  <settings src="settings/wikipedia.xml"/>
+  <settings src="settings/testserver.xml"/>
   
   <icu_chain id="relevance" locale="en">
     <transform rule="[:Control:] Any-Remove"/>
diff --git a/etc/settings/testserver.xml b/etc/settings/testserver.xml
index 36435b1..69a8c36 100644
--- a/etc/settings/testserver.xml
+++ b/etc/settings/testserver.xml
@@ -6,8 +6,7 @@
   <set name="pz:apdulog" value="1"/>
 
   <!-- mapping for unqualified search -->
-  <!-- <set name="pz:cclmap:term" value="u=1016 t=l,r s=al"/> -->
-  <set name="pz:cclmap:term" value="u=my\x2cb t=l,r s=al"/>
+  <set name="pz:cclmap:term" value="u=1016 t=l,r s=al"/>
 
   <!-- field-specific mappings -->
   <set name="pz:cclmap:ti" value="u=4 s=al"/>