From: Dennis Schafroth <dennis@indexdata.com>
Date: Fri, 14 Jan 2011 13:59:42 +0000 (+0100)
Subject: Renamed urls files to .urls: easier to clean out run data
X-Git-Tag: v1.5.2~13
X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;h=21b5d8d11f4cf5904a432a9cdc009c44c9630231;p=pazpar2-moved-to-github.git

Renamed urls files to .urls: easier to clean out run data
---

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index e59aa4f..33ce05b 100755
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -53,7 +53,7 @@ if test "x${PREFIX}" = "x"; then
 fi
 
 CFG=${PREFIX}.cfg
-URLS=${PREFIX}_urls
+URLS=${PREFIX}.urls
 VALGRINDLOG=${PREFIX}_valgrind.log
 
 if test -n "$PAZPAR2_USE_VALGRIND"; then
diff --git a/test/test_facets.urls b/test/test_facets.urls
new file mode 100644
index 0000000..b523234
--- /dev/null
+++ b/test/test_facets.urls
@@ -0,0 +1,24 @@
+http://localhost:9763/search.pz2?command=init&clear=1
+http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Blocalhost:9999%2Fdb1%5D=db1&pz:requestsyntax%5Blocalhost:9999%2Fdb1%5D=usmarc&pz:nativesyntax%5Blocalhost:9999%2Fdb1%5D=txml&pz:xslt%5Blocalhost:9999%2Fdb1%5D=tmarc.xsl&pz:termlist_term_count%5Blocalhost:9999%2Fdb1%5D=0
+http://localhost:9763/search.pz2?session=1&command=search&query=7+and+computer
+http://localhost:9763/search.pz2?session=1&command=show&block=1
+http://localhost:9763/search.pz2?session=1&command=bytarget
+http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
+http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Blocalhost:9999%2Fdb2%5D=db2&pz:requestsyntax%5Blocalhost:9999%2Fdb2%5D=usmarc&pz:nativesyntax%5Blocalhost:9999%2Fdb2%5D=txml&pz:xslt%5Blocalhost:9999%2Fdb2%5D=tmarc.xsl&pz:termlist_term_count%5Blocalhost:9999%2Fdb2%5D=5
+http://localhost:9763/search.pz2?session=1&command=search&query=4+and+computer
+http://localhost:9763/search.pz2?session=1&command=show&block=1
+http://localhost:9763/search.pz2?session=1&command=bytarget
+http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
+http://localhost:9763/search.pz2?session=1&command=search&query=8+and+computer
+http://localhost:9763/search.pz2?session=1&command=show&block=1
+http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
+http://localhost:9763/search.pz2?session=1&command=search&query=6+and+computer
+http://localhost:9763/search.pz2?session=1&command=show
+http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
+10 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
+http://localhost:9763/search.pz2?session=1&command=bytarget
+http://localhost:9763/search.pz2?command=init
+http://localhost:9763/search.pz2?session=2&command=settings&pz:name%5Blocalhost:9999%2Fdb2%5D=db2&pz:requestsyntax%5Blocalhost:9999%2Fdb2%5D=usmarc&pz:nativesyntax%5Blocalhost:9999%2Fdb2%5D=txml&pz:xslt%5Blocalhost:9999%2Fdb2%5D=tmarc.xsl&pz:apdulog%5Blocalhost:9999%2Fdb2%5D=1
+http://localhost:9763/search.pz2?session=2&command=search&query=9+and+computer
+2 http://localhost:9763/search.pz2?session=2&command=show&block=1
+http://localhost:9763/search.pz2?session=2&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
diff --git a/test/test_facets_urls b/test/test_facets_urls
deleted file mode 100644
index b523234..0000000
--- a/test/test_facets_urls
+++ /dev/null
@@ -1,24 +0,0 @@
-http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Blocalhost:9999%2Fdb1%5D=db1&pz:requestsyntax%5Blocalhost:9999%2Fdb1%5D=usmarc&pz:nativesyntax%5Blocalhost:9999%2Fdb1%5D=txml&pz:xslt%5Blocalhost:9999%2Fdb1%5D=tmarc.xsl&pz:termlist_term_count%5Blocalhost:9999%2Fdb1%5D=0
-http://localhost:9763/search.pz2?session=1&command=search&query=7+and+computer
-http://localhost:9763/search.pz2?session=1&command=show&block=1
-http://localhost:9763/search.pz2?session=1&command=bytarget
-http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
-http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Blocalhost:9999%2Fdb2%5D=db2&pz:requestsyntax%5Blocalhost:9999%2Fdb2%5D=usmarc&pz:nativesyntax%5Blocalhost:9999%2Fdb2%5D=txml&pz:xslt%5Blocalhost:9999%2Fdb2%5D=tmarc.xsl&pz:termlist_term_count%5Blocalhost:9999%2Fdb2%5D=5
-http://localhost:9763/search.pz2?session=1&command=search&query=4+and+computer
-http://localhost:9763/search.pz2?session=1&command=show&block=1
-http://localhost:9763/search.pz2?session=1&command=bytarget
-http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
-http://localhost:9763/search.pz2?session=1&command=search&query=8+and+computer
-http://localhost:9763/search.pz2?session=1&command=show&block=1
-http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
-http://localhost:9763/search.pz2?session=1&command=search&query=6+and+computer
-http://localhost:9763/search.pz2?session=1&command=show
-http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
-10 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
-http://localhost:9763/search.pz2?session=1&command=bytarget
-http://localhost:9763/search.pz2?command=init
-http://localhost:9763/search.pz2?session=2&command=settings&pz:name%5Blocalhost:9999%2Fdb2%5D=db2&pz:requestsyntax%5Blocalhost:9999%2Fdb2%5D=usmarc&pz:nativesyntax%5Blocalhost:9999%2Fdb2%5D=txml&pz:xslt%5Blocalhost:9999%2Fdb2%5D=tmarc.xsl&pz:apdulog%5Blocalhost:9999%2Fdb2%5D=1
-http://localhost:9763/search.pz2?session=2&command=search&query=9+and+computer
-2 http://localhost:9763/search.pz2?session=2&command=show&block=1
-http://localhost:9763/search.pz2?session=2&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
diff --git a/test/test_gbv_de.urls b/test/test_gbv_de.urls
new file mode 100644
index 0000000..e0d8137
--- /dev/null
+++ b/test/test_gbv_de.urls
@@ -0,0 +1,14 @@
+http://localhost:9763/search.pz2?command=init&clear=1
+http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1
+http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer%22
+4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+http://localhost:9763/search.pz2?session=1&command=bytarget
+http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
+http://localhost:9763/search.pz2?command=init&clear=1
+http://localhost:9763/search.pz2?session=2&command=settings&pz:sru%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1&pz:termlist_term_count%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=5&pz:preferred%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1
+http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22computer%22
+http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
+http://localhost:9763/search.pz2?session=2&command=show&block=preferred
+http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22xyzy%22
+http://localhost:9763/search.pz2?session=2&command=show&block=preferred
+http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
diff --git a/test/test_gbv_de_urls b/test/test_gbv_de_urls
deleted file mode 100644
index e0d8137..0000000
--- a/test/test_gbv_de_urls
+++ /dev/null
@@ -1,14 +0,0 @@
-http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1
-http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer%22
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
-http://localhost:9763/search.pz2?session=1&command=bytarget
-http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
-http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=2&command=settings&pz:sru%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1&pz:termlist_term_count%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=5&pz:preferred%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1
-http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22computer%22
-http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
-http://localhost:9763/search.pz2?session=2&command=show&block=preferred
-http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22xyzy%22
-http://localhost:9763/search.pz2?session=2&command=show&block=preferred
-http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
diff --git a/test/test_http.urls b/test/test_http.urls
new file mode 100644
index 0000000..e94d528
--- /dev/null
+++ b/test/test_http.urls
@@ -0,0 +1,57 @@
+http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F&pz:elements%5Bz3950.indexdata.com%2Fgils%5D=F
+http://localhost:9763/search.pz2?session=1&command=stat
+http://localhost:9763/search.pz2?session=1&command=ping
+http://localhost:9763/search.pz2?session=1&command=search&query=computer
+2 http://localhost:9763/search.pz2?session=1&command=show&block=1
+http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book
+http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0
+http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:0
+http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:1
+http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:0
+http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:1
+http://localhost:9763/search.pz2?command=search&query=function%20()%20%7B%250A%20%20%20%20var%20ccl%20=%20%22%22;%250A%20%20%20%20if%20(this.simpleQuery%20!=%20%22%22)%20%7B%250A%20%20%20%20%20%20%20%20ccl%20=%20this.simpleQuery;%250A%20%20%20%20%7D%250A%20%20%20%20for%20(var%20i%20=%200;%20i%20%3C%20this.advTerms.length;%20i++)%20%7B%250A%20%20%20%20%20%20%20%20if%20(ccl%20!=%20%22%22)%20%7B%250A%20%20%20%20%20%20%20%20%20%20%20%20ccl%20=%20ccl%20+%20%22%20and%20%22;%250A%20%20%20%20%20%20%20%20%7D%250A%20%20%20%20%20%20%20%20ccl%20=%20ccl%20+%20this.advTerms%5Bi%5D.field%20+%20%22=%5C%22%22%20+%20this.advTerms%5Bi%5D.value%20+%20%22%5C%22%22;%250A%20%20%20%20%7D%250A%20%20%20%20return%20ccl;%250A%7D&session=1&filter=function%20()%20%7B%250A%20%20%20%20if%20(this.singleFilter%20!=%20null)%20%7B%250A%20%20%20%20%20%20%20%20return%20%22pz:id=%22%20+%20this.singleFilter.id;%250A%20%20%20%20%7D%20else%20if%20(this.filterNums%20%3C=%200)%20%7B%250A%20%20%20%20%20%20%20%20return%20undefined;%250A%20%20%20%20%7D%250A%20%20%20%20var%20filter%20=%20%22pz:id=%22;%250A%20%20%20%20for%20(var%20i%20=%200;%20i%20%3C%20this.filterHash.length;%20i++)%20%7B%250A%20%20%20%20%20%20%20%20if%20(this.filterHash%5Bi%5D%20==%20undefined)%20%7B%250A%20%20%20%20%20%20%20%20%20%20%20%20continue;%250A%20%20%20%20%20%20%20%20%7D%250A%20%20%20%20%20%20%20%20if%20(filter%20%3E%20%22pz:id=%22)%20%7B%250A%20%20%20%20%20%20%20%20%20%20%20%20filter%20=%20filter%20+%20%22%7C%22;%250A%20%20%20%20%20%20%20%20%7D%250A%20%20%20%20%20%20%20%20filter%20+=%20this.filterHash%5Bi%5D.id;%250A%20%20%20%20%7D%250A%20%20%20%20return%20filter;%250A%7D
+http://localhost:9763/search.pz2?session=1&command=show&sort=date:1&block=1
+http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1
+http://localhost:9763/search.pz2?command=init&clear=1
+http://localhost:9763/search.pz2?session=2&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=usmarc&pz:nativesyntax%23DUMMY%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=marc21%5Ftest.xsl
+http://localhost:9763/search.pz2?session=2&command=search&query=computer
+2 http://localhost:9763/search.pz2?session=2&command=show&block=1
+http://localhost:9763/search.pz2?session=2&command=search&query=kubiak%20stanis%C5%82aw
+http://localhost:9763/search.pz2?session=2&command=search&query=kubiak%20sts%C5%82aw
+2 http://localhost:9763/search.pz2?session=2&command=bytarget
+http://localhost:9763/search.pz2?session=1&command=search&query=computer
+1 http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book
+http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0&binary=1
+http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0&binary=1&syntax=usmarc
+http://localhost:9763/search.pz2?command=init&service=gils
+http://localhost:9763/search.pz2?session=3&command=search&query=utah
+2 http://localhost:9763/search.pz2?session=3&command=show&block=1
+http://localhost:9763/search.pz2?command=init&clear=1
+http://localhost:9763/search.pz2?session=4&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=marc21.mmap
+http://localhost:9763/search.pz2?session=4&command=search&query=computer
+2 http://localhost:9763/search.pz2?session=4&command=show&block=1
+http://localhost:9763/search.pz2?command=init
+http://localhost:9763/search.pz2?session=5&command=settings&pz:name%5Bz3950.indexdata.com%2Fmarc%5D=marc&pz:requestsyntax%5Bz3950.indexdata.com%2Fmarc%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fmarc%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fmarc%5D=marc21%5Ftest.xsl&pz:recordfilter%5Bz3950.indexdata.com%2Fmarc%5D=date
+http://localhost:9763/search.pz2?session=5&command=search&query=computer&filter=pz%3Aid%3Dz3950.indexdata.com%2Fmarc
+2 http://localhost:9763/search.pz2?session=5&command=show&block=1
+http://localhost:9763/search.pz2?session=5&command=search&query=computer&filter=pz%3Aid%3Dunknown
+http://localhost:9763/search.pz2?session=3&command=settings&pz:maxrecs%5Bz3950.indexdata.com%2Fgils%5D=8
+http://localhost:9763/search.pz2?session=3&command=search&query=the
+http://localhost:9763/search.pz2?session=5&command=search&query=the&maxrecs=5&startrecs=2
+2 http://localhost:9763/search.pz2?session=3&command=show&block=1
+http://localhost:9763/search.pz2?session=5&command=show&block=1
+http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F
+1 http://localhost:9763/search.pz2?session=6&command=search&query=louis
+1 http://localhost:9763/search.pz2?session=6&command=show&block=1
+http://localhost:9763/search.pz2?session=6&command=record&id=title+computer+processing+of+dynamic+images+from+an+anger+scintillation+camera+author+medium+book&offset=0
+http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F
+http://localhost:9763/search.pz2?session=7&command=search&query=greece
+1 http://localhost:9763/search.pz2?session=7&command=show&block=1
+1 http://localhost:9763/search.pz2?session=6&command=show&block=1
+http://localhost:9763/search.pz2?session=6&command=record&id=title+computer+processing+of+dynamic+images+from+an+anger+scintillation+camera+author+medium+book&offset=0
+http://localhost:9763/search.pz2?command=init
+http://localhost:9763/search.pz2?session=8&command=settings&pz:name%5Bz3950.indexdata.com%2Fmarc%5D=marc&pz:requestsyntax%5Bz3950.indexdata.com%2Fmarc%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fmarc%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fmarc%5D=marc21%5Ftest.xsl&pz:recordfilter%5Bz3950.indexdata.com%2Fmarc%5D=date
+http://localhost:9763/search.pz2?session=8&command=search&query=xyzzyz
+2 http://localhost:9763/search.pz2?session=8&command=show&block=1
+http://localhost:9763/search.pz2?session=8&command=search&query=a+and
+1 http://localhost:9763/search.pz2?session=8&command=show&block=1
diff --git a/test/test_http_urls b/test/test_http_urls
deleted file mode 100644
index e94d528..0000000
--- a/test/test_http_urls
+++ /dev/null
@@ -1,57 +0,0 @@
-http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F&pz:elements%5Bz3950.indexdata.com%2Fgils%5D=F
-http://localhost:9763/search.pz2?session=1&command=stat
-http://localhost:9763/search.pz2?session=1&command=ping
-http://localhost:9763/search.pz2?session=1&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1
-http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book
-http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0
-http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:0
-http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:1
-http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:0
-http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:1
-http://localhost:9763/search.pz2?command=search&query=function%20()%20%7B%250A%20%20%20%20var%20ccl%20=%20%22%22;%250A%20%20%20%20if%20(this.simpleQuery%20!=%20%22%22)%20%7B%250A%20%20%20%20%20%20%20%20ccl%20=%20this.simpleQuery;%250A%20%20%20%20%7D%250A%20%20%20%20for%20(var%20i%20=%200;%20i%20%3C%20this.advTerms.length;%20i++)%20%7B%250A%20%20%20%20%20%20%20%20if%20(ccl%20!=%20%22%22)%20%7B%250A%20%20%20%20%20%20%20%20%20%20%20%20ccl%20=%20ccl%20+%20%22%20and%20%22;%250A%20%20%20%20%20%20%20%20%7D%250A%20%20%20%20%20%20%20%20ccl%20=%20ccl%20+%20this.advTerms%5Bi%5D.field%20+%20%22=%5C%22%22%20+%20this.advTerms%5Bi%5D.value%20+%20%22%5C%22%22;%250A%20%20%20%20%7D%250A%20%20%20%20return%20ccl;%250A%7D&session=1&filter=function%20()%20%7B%250A%20%20%20%20if%20(this.singleFilter%20!=%20null)%20%7B%250A%20%20%20%20%20%20%20%20return%20%22pz:id=%22%20+%20this.singleFilter.id;%250A%20%20%20%20%7D%20else%20if%20(this.filterNums%20%3C=%200)%20%7B%250A%20%20%20%20%20%20%20%20return%20undefined;%250A%20%20%20%20%7D%250A%20%20%20%20var%20filter%20=%20%22pz:id=%22;%250A%20%20%20%20for%20(var%20i%20=%200;%20i%20%3C%20this.filterHash.length;%20i++)%20%7B%250A%20%20%20%20%20%20%20%20if%20(this.filterHash%5Bi%5D%20==%20undefined)%20%7B%250A%20%20%20%20%20%20%20%20%20%20%20%20continue;%250A%20%20%20%20%20%20%20%20%7D%250A%20%20%20%20%20%20%20%20if%20(filter%20%3E%20%22pz:id=%22)%20%7B%250A%20%20%20%20%20%20%20%20%20%20%20%20filter%20=%20filter%20+%20%22%7C%22;%250A%20%20%20%20%20%20%20%20%7D%250A%20%20%20%20%20%20%20%20filter%20+=%20this.filterHash%5Bi%5D.id;%250A%20%20%20%20%7D%250A%20%20%20%20return%20filter;%250A%7D
-http://localhost:9763/search.pz2?session=1&command=show&sort=date:1&block=1
-http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1
-http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=2&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=usmarc&pz:nativesyntax%23DUMMY%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=marc21%5Ftest.xsl
-http://localhost:9763/search.pz2?session=2&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=2&command=show&block=1
-http://localhost:9763/search.pz2?session=2&command=search&query=kubiak%20stanis%C5%82aw
-http://localhost:9763/search.pz2?session=2&command=search&query=kubiak%20sts%C5%82aw
-2 http://localhost:9763/search.pz2?session=2&command=bytarget
-http://localhost:9763/search.pz2?session=1&command=search&query=computer
-1 http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book
-http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0&binary=1
-http://localhost:9763/search.pz2?session=1&command=record&id=title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0&binary=1&syntax=usmarc
-http://localhost:9763/search.pz2?command=init&service=gils
-http://localhost:9763/search.pz2?session=3&command=search&query=utah
-2 http://localhost:9763/search.pz2?session=3&command=show&block=1
-http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=4&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=marc21.mmap
-http://localhost:9763/search.pz2?session=4&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=4&command=show&block=1
-http://localhost:9763/search.pz2?command=init
-http://localhost:9763/search.pz2?session=5&command=settings&pz:name%5Bz3950.indexdata.com%2Fmarc%5D=marc&pz:requestsyntax%5Bz3950.indexdata.com%2Fmarc%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fmarc%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fmarc%5D=marc21%5Ftest.xsl&pz:recordfilter%5Bz3950.indexdata.com%2Fmarc%5D=date
-http://localhost:9763/search.pz2?session=5&command=search&query=computer&filter=pz%3Aid%3Dz3950.indexdata.com%2Fmarc
-2 http://localhost:9763/search.pz2?session=5&command=show&block=1
-http://localhost:9763/search.pz2?session=5&command=search&query=computer&filter=pz%3Aid%3Dunknown
-http://localhost:9763/search.pz2?session=3&command=settings&pz:maxrecs%5Bz3950.indexdata.com%2Fgils%5D=8
-http://localhost:9763/search.pz2?session=3&command=search&query=the
-http://localhost:9763/search.pz2?session=5&command=search&query=the&maxrecs=5&startrecs=2
-2 http://localhost:9763/search.pz2?session=3&command=show&block=1
-http://localhost:9763/search.pz2?session=5&command=show&block=1
-http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F
-1 http://localhost:9763/search.pz2?session=6&command=search&query=louis
-1 http://localhost:9763/search.pz2?session=6&command=show&block=1
-http://localhost:9763/search.pz2?session=6&command=record&id=title+computer+processing+of+dynamic+images+from+an+anger+scintillation+camera+author+medium+book&offset=0
-http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F
-http://localhost:9763/search.pz2?session=7&command=search&query=greece
-1 http://localhost:9763/search.pz2?session=7&command=show&block=1
-1 http://localhost:9763/search.pz2?session=6&command=show&block=1
-http://localhost:9763/search.pz2?session=6&command=record&id=title+computer+processing+of+dynamic+images+from+an+anger+scintillation+camera+author+medium+book&offset=0
-http://localhost:9763/search.pz2?command=init
-http://localhost:9763/search.pz2?session=8&command=settings&pz:name%5Bz3950.indexdata.com%2Fmarc%5D=marc&pz:requestsyntax%5Bz3950.indexdata.com%2Fmarc%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fmarc%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fmarc%5D=marc21%5Ftest.xsl&pz:recordfilter%5Bz3950.indexdata.com%2Fmarc%5D=date
-http://localhost:9763/search.pz2?session=8&command=search&query=xyzzyz
-2 http://localhost:9763/search.pz2?session=8&command=show&block=1
-http://localhost:9763/search.pz2?session=8&command=search&query=a+and
-1 http://localhost:9763/search.pz2?session=8&command=show&block=1
diff --git a/test/test_icu.urls b/test/test_icu.urls
new file mode 100644
index 0000000..11a5dae
--- /dev/null
+++ b/test/test_icu.urls
@@ -0,0 +1,9 @@
+http://localhost:9763/search.pz2?command=init
+http://localhost:9763/search.pz2?session=1&command=stat
+http://localhost:9763/search.pz2?session=1&command=search&query=computer
+2 http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:0
+http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:1
+http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:0
+http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:1
+http://localhost:9763/search.pz2?session=1&command=termlist&name=author%2Csubject
+http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1
\ No newline at end of file
diff --git a/test/test_icu_urls b/test/test_icu_urls
deleted file mode 100644
index 11a5dae..0000000
--- a/test/test_icu_urls
+++ /dev/null
@@ -1,9 +0,0 @@
-http://localhost:9763/search.pz2?command=init
-http://localhost:9763/search.pz2?session=1&command=stat
-http://localhost:9763/search.pz2?session=1&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:0
-http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:1
-http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:0
-http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:1
-http://localhost:9763/search.pz2?session=1&command=termlist&name=author%2Csubject
-http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1
\ No newline at end of file
diff --git a/test/test_post.urls b/test/test_post.urls
new file mode 100644
index 0000000..3bf0975
--- /dev/null
+++ b/test/test_post.urls
@@ -0,0 +1,12 @@
+marc_service.xml http://localhost:9763/search.pz2?command=init
+http://localhost:9763/search.pz1?session=1&command=search&query=computer
+gils_service.xml http://localhost:9763/search.pz2?command=init
+http://localhost:9763/search.pz1?session=2&command=search&query=computer
+gils_service.xml http://localhost:9763/search.pz2?command=init&clear=1
+z3950_indexdata_com_marc.xml
+http://localhost:9763/search.pz1?session=3&command=settings
+http://localhost:9763/search.pz1?session=3&command=search&query=computer
+2 http://localhost:9763/search.pz1?session=1&command=show
+http://localhost:9763/search.pz1?session=2&command=show
+http://localhost:9763/search.pz1?session=3&command=show
+http://localhost:9763/search.pz1?session=3&command=bytarget
diff --git a/test/test_post_urls b/test/test_post_urls
deleted file mode 100644
index 3bf0975..0000000
--- a/test/test_post_urls
+++ /dev/null
@@ -1,12 +0,0 @@
-marc_service.xml http://localhost:9763/search.pz2?command=init
-http://localhost:9763/search.pz1?session=1&command=search&query=computer
-gils_service.xml http://localhost:9763/search.pz2?command=init
-http://localhost:9763/search.pz1?session=2&command=search&query=computer
-gils_service.xml http://localhost:9763/search.pz2?command=init&clear=1
-z3950_indexdata_com_marc.xml
-http://localhost:9763/search.pz1?session=3&command=settings
-http://localhost:9763/search.pz1?session=3&command=search&query=computer
-2 http://localhost:9763/search.pz1?session=1&command=show
-http://localhost:9763/search.pz1?session=2&command=show
-http://localhost:9763/search.pz1?session=3&command=show
-http://localhost:9763/search.pz1?session=3&command=bytarget
diff --git a/test/test_preferred.urls b/test/test_preferred.urls
new file mode 100644
index 0000000..3406089
--- /dev/null
+++ b/test/test_preferred.urls
@@ -0,0 +1,6 @@
+http://localhost:9763/search.pz2?command=init&clear=1
+http://localhost:9763/search.pz2?session=1&command=settings&full_text_target%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=NO&use_url_proxy%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Apiggyback%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Ablock_timeout%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Acclmap%3Asu%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Asru%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=solr&use_thumbnails%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Acclmap%3Adate%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Ddate&pz%3Aname%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=Oaister+%28SOLR%29&pz%3Acclmap%3Aissn%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=u%3D8&pz%3Acclmap%3Ati%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Aau%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Axslt%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Acclmap%3Aterm%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtext+s%3Dal&pz%3Acclmap%3Aisbn%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Aqueryencoding%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=UTF-8&full_text_target%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=NO&use_url_proxy%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=0&pz%3Apreferred%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=1&pz%3Apiggyback%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=1&pz%3Aauthentication%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=idtest%2Fidtest36&pz%3Acclmap%3Asu%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=u%3D21+s%3Dal&use_thumbnails%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=1&pz%3Arequestsyntax%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=xml&pz%3Aname%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=MIT+OpenCourseWare&pz%3Acclmap%3Aissn%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=u%3D8&pz%3Acclmap%3Ati%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=u%3D4+s%3Dal&pz%3Acclmap%3Aau%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=u%3D1003+s%3Dal&pz%3Axslt%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=cf.xsl&pz%3Acclmap%3Aterm%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=u%3D1016+t%3Dl%2Cr+s%3Dal+2%3D102&pz%3Acclmap%3Aisbn%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=u%3D7&pz%3Aqueryencoding%5Bconnect.indexdata.com%3A9000%2Fmit_opencourseware%5D=UTF-8&full_text_target%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=NO&pz%3Atermlist_term_count%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=10&use_url_proxy%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Apiggyback%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Apreferred%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Ablock_timeout%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=2&pz%3Acclmap%3Asu%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Asru%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=solr&use_thumbnails%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Aname%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=LOC+%28SOLR%29&pz%3Acclmap%3Aissn%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=u%3D8&pz%3Acclmap%3Ati%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Aau%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Axslt%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Acclmap%3Aterm%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtext+s%3Dal&pz%3Acclmap%3Aisbn%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Aqueryencoding%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=UTF-8
+http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer%22
+4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+http://localhost:9763/search.pz2?session=1&command=bytarget
+http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
diff --git a/test/test_settings.urls b/test/test_settings.urls
new file mode 100644
index 0000000..82e2822
--- /dev/null
+++ b/test/test_settings.urls
@@ -0,0 +1,8 @@
+http://localhost:9763/search.pz2?command=init
+http://localhost:9763/search.pz2?command=init&clear=1
+http://localhost:9763/search.pz2?session=1&command=settings&category%5Bz3950.indexdata.com%2Fmarc%5D=1
+http://localhost:9763/search.pz2?session=1&command=search&query=water
+http://localhost:9763/search.pz2?session=2&command=settings&pz:name%5Bz3950.indexdata.com%2Fmarc%5D=1&pz:cclmap:term%5Bz3950.indexdata.com%2Fmarc%5D=u%3D1016&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F
+http://localhost:9763/search.pz2?session=2&command=search&query=water
+3 http://localhost:9763/search.pz2?session=1&command=bytarget&settings=1
+http://localhost:9763/search.pz2?session=2&command=bytarget&settings=1
diff --git a/test/test_settings_urls b/test/test_settings_urls
deleted file mode 100644
index 82e2822..0000000
--- a/test/test_settings_urls
+++ /dev/null
@@ -1,8 +0,0 @@
-http://localhost:9763/search.pz2?command=init
-http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=1&command=settings&category%5Bz3950.indexdata.com%2Fmarc%5D=1
-http://localhost:9763/search.pz2?session=1&command=search&query=water
-http://localhost:9763/search.pz2?session=2&command=settings&pz:name%5Bz3950.indexdata.com%2Fmarc%5D=1&pz:cclmap:term%5Bz3950.indexdata.com%2Fmarc%5D=u%3D1016&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F
-http://localhost:9763/search.pz2?session=2&command=search&query=water
-3 http://localhost:9763/search.pz2?session=1&command=bytarget&settings=1
-http://localhost:9763/search.pz2?session=2&command=bytarget&settings=1
diff --git a/test/test_solr.urls b/test/test_solr.urls
new file mode 100644
index 0000000..e0d8137
--- /dev/null
+++ b/test/test_solr.urls
@@ -0,0 +1,14 @@
+http://localhost:9763/search.pz2?command=init&clear=1
+http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1
+http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer%22
+4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+http://localhost:9763/search.pz2?session=1&command=bytarget
+http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
+http://localhost:9763/search.pz2?command=init&clear=1
+http://localhost:9763/search.pz2?session=2&command=settings&pz:sru%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1&pz:termlist_term_count%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=5&pz:preferred%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1
+http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22computer%22
+http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
+http://localhost:9763/search.pz2?session=2&command=show&block=preferred
+http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22xyzy%22
+http://localhost:9763/search.pz2?session=2&command=show&block=preferred
+http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
diff --git a/test/test_solr_urls b/test/test_solr_urls
deleted file mode 100644
index e0d8137..0000000
--- a/test/test_solr_urls
+++ /dev/null
@@ -1,14 +0,0 @@
-http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1
-http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer%22
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
-http://localhost:9763/search.pz2?session=1&command=bytarget
-http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
-http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=2&command=settings&pz:sru%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1&pz:termlist_term_count%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=5&pz:preferred%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1
-http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22computer%22
-http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
-http://localhost:9763/search.pz2?session=2&command=show&block=preferred
-http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22xyzy%22
-http://localhost:9763/search.pz2?session=2&command=show&block=preferred
-http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
diff --git a/test/test_sru.urls b/test/test_sru.urls
new file mode 100644
index 0000000..d10ee84
--- /dev/null
+++ b/test/test_sru.urls
@@ -0,0 +1,5 @@
+http://localhost:9763/search.pz2?command=init&clear=1
+http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Bgso.gbv.de%2Fsru%2FDB%5D=get&pz%3Aname%5Bgso.gbv.de%2Fsru%2FDB%5D=SOLR+Test&pz%3Acclmap%3Ati%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Dtitle&pz%3Axslt%5Bgso.gbv.de%2Fsru%2FDB%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Bgso.gbv.de%2Fsru%2FDB%5D=UTF-8&pz%3Aapdulog%5Bgso.gbv.de%2Fsru%2FDB%5D=1&pz%3Asru_version%5Bgso.gbv.de%2Fsru%2FDB%5D=1.1
+http://localhost:9763/search.pz2?session=1&command=search&query=cql:man
+4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+
diff --git a/test/test_sru_urls b/test/test_sru_urls
deleted file mode 100644
index d10ee84..0000000
--- a/test/test_sru_urls
+++ /dev/null
@@ -1,5 +0,0 @@
-http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Bgso.gbv.de%2Fsru%2FDB%5D=get&pz%3Aname%5Bgso.gbv.de%2Fsru%2FDB%5D=SOLR+Test&pz%3Acclmap%3Ati%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Bgso.gbv.de%2Fsru%2FDB%5D=1%3Dtitle&pz%3Axslt%5Bgso.gbv.de%2Fsru%2FDB%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Bgso.gbv.de%2Fsru%2FDB%5D=UTF-8&pz%3Aapdulog%5Bgso.gbv.de%2Fsru%2FDB%5D=1&pz%3Asru_version%5Bgso.gbv.de%2Fsru%2FDB%5D=1.1
-http://localhost:9763/search.pz2?session=1&command=search&query=cql:man
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
-
diff --git a/test/test_turbomarcxml.urls b/test/test_turbomarcxml.urls
new file mode 100644
index 0000000..7d2b76c
--- /dev/null
+++ b/test/test_turbomarcxml.urls
@@ -0,0 +1,8 @@
+http://localhost:9763/search.pz2?command=init&clear=1
+http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=xml&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=marc21_test.xsl
+http://localhost:9763/search.pz2?session=1&command=search&query=computer
+2 http://localhost:9763/search.pz2?session=1&command=show&block=1
+http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=txml&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=tmarc.xsl
+http://localhost:9763/search.pz2?session=1&command=search&query=computer
+2 http://localhost:9763/search.pz2?session=1&command=show&block=1
+2 http://localhost:9763/search.pz2?session=1&command=bytarget
diff --git a/test/test_turbomarcxml_urls b/test/test_turbomarcxml_urls
deleted file mode 100644
index 7d2b76c..0000000
--- a/test/test_turbomarcxml_urls
+++ /dev/null
@@ -1,8 +0,0 @@
-http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=xml&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=marc21_test.xsl
-http://localhost:9763/search.pz2?session=1&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1
-http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=txml&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=tmarc.xsl
-http://localhost:9763/search.pz2?session=1&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1
-2 http://localhost:9763/search.pz2?session=1&command=bytarget