Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

diff --git a/test/dtic-dads-sru-proxy.xml b/test/dtic-dads-sru-proxy.xml
index eb3bd65..e21fe1b 100644 (file)
--- a/test/dtic-dads-sru-proxy.xml
+++ b/test/dtic-dads-sru-proxy.xml
@@ -11,7 +11,7 @@
 
   <!-- mapping for unqualified search -->
 
-  <set name="pz:extra_args" value="&x-facet_def=dtic_test&x-noxsl=1" />
+  <set name="pz:extra_args" value="%26x-facet_def%3Ddtic_test%26x-noxsl%3D1" />
   <set name="pz:query_syntax" value="pqf" />
 
   <!-- Retrieval settings -->

diff --git a/test/test_sru-proxy.cfg b/test/test_sru-proxy.cfg
index 4fb2ea7..976696c 100644 (file)
--- a/test/test_sru-proxy.cfg
+++ b/test/test_sru-proxy.cfg
@@ -5,7 +5,7 @@
     <listen port="9763"/>
     <proxy host="localhost"/>
     
-    <service>
+    <service id="sru-proxy">
       <include src="dtic-dads-sru-proxy.xml"/>
       <targetprofiles type="local" src="../zeerex/records/"/>
       <metadata name="url" merge="unique"/>

diff --git a/test/test_sru-proxy.urls b/test/test_sru-proxy.urls
index d86191a..e405879 100644 (file)
--- a/test/test_sru-proxy.urls
+++ b/test/test_sru-proxy.urls
@@ -1,4 +1,4 @@
-http://localhost:9763/search.pz2?command=init&clear=1
+http://localhost:9763/search.pz2?command=init&clear=0&service=sru-proxy
 http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=get&pz%3Aname%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=sru-proxy&pz%3Axslt%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=dads-pz2.xsl&pz%3Aqueryencoding%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=UTF-8&pz%3Aapdulog%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1&pz%3Asru_version%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1.1&pz%3Aextra_args%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=%26x-facet_def%3Ddtic_test%26x-noxsl%3D1&pz:query_syntax%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=pqf
 http://localhost:9763/search.pz2?session=1&command=search&query=water
 4 http://localhost:9763/search.pz2?session=1&command=show&block=1