For testing ^[0-9] is sleep, ^w is wait

Allows us to have real wait and poll/wait until stable result.

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 20395aa..34829b9 100755 (executable)
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -242,8 +242,11 @@ for f in `cat ${srcdir}/${URLS}`; do
        testno=`expr $testno + 1`
        postfile=
        rounds=1
-    elif echo $f | grep '^[0-9]' >/dev/null; then
+    elif echo $f | grep '^w' >/dev/null; then
        rounds=$maxrounds
+    elif echo $f | grep '^[0-9]' >/dev/null; then
+       sleep $f
+       rounds=1
     else
        if test -f $srcdir/$f; then
            postfile=$srcdir/$f

diff --git a/test/test_cluster.urls b/test/test_cluster.urls
index 6c772d5..3bc2510 100755 (executable)
--- a/test/test_cluster.urls
+++ b/test/test_cluster.urls
@@ -1,9 +1,9 @@
 http://localhost:9763/search.pz2?command=init
 http://localhost:9763/search.pz2?session=1&command=search&query=1
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=2
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=3
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=4
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1

diff --git a/test/test_dads.urls b/test/test_dads.urls
index 48e1f57..d8db7aa 100644 (file)
--- a/test/test_dads.urls
+++ b/test/test_dads.urls
@@ -1,7 +1,7 @@
 http://localhost:9763/search.pz2?command=init&clear=1
 http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=GET&pz%3Aname%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=SOLR+Test&pz%3Acclmap%3Ati%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Dtitle&pz%3Axslt%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=dads-pz2.xsl&pz%3Aqueryencoding%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=UTF-8&pz%3Aapdulog%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1&pz:facetmap:author%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=creator&pz:facetmap:subject%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=subject&pz:facetmap:date%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=creationdate&pz:extra_args%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=%26x-facet_def%3Ddbc_test_production%26x-noxsl%3D1&pz:query_syntax%5Bdbc-test.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
+w 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%2Csubject%2Cauthor%2Cdate%2Cmedium
 http://localhost:9763/search.pz2?command=init&clear=1
@@ -12,4 +12,4 @@ 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%2Csubject%2Cauthor%2Cdate%2Cmedium
-http://localhost:9763/search.pz2?session=2&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
\ No newline at end of file
+http://localhost:9763/search.pz2?session=2&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium

diff --git a/test/test_facets.urls b/test/test_facets.urls
index bf2924b..da84d76 100644 (file)
--- a/test/test_facets.urls
+++ b/test/test_facets.urls
@@ -3,7 +3,7 @@ ztest_localhost_settings.xml http://localhost:9763/search.pz2?session=1&command=
 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
-4 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium
+w http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium
 test_facets_settings_1.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=4+and+computer
 http://localhost:9763/search.pz2?session=1&command=show&block=1
@@ -15,13 +15,13 @@ http://localhost:9763/search.pz2?session=1&command=termlist
 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%2Cmedium
-10 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium
+w http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium
 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?command=init
 ztest_localhost_settings.xml http://localhost:9763/search.pz2?session=2&command=settings
 test_facets_settings_2.xml http://localhost:9763/search.pz2?session=2&command=settings
 http://localhost:9763/search.pz2?session=2&command=search&query=9+and+computer
-10 http://localhost:9763/search.pz2?session=2&command=show&block=1
+w 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%2Cmedium
 http://localhost:9763/search.pz2?session=2&command=search&query=9+and+computer
 http://localhost:9763/search.pz2?session=2&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium

diff --git a/test/test_filter.urls b/test/test_filter.urls
index 71014ee..fefe93b 100644 (file)
--- a/test/test_filter.urls
+++ b/test/test_filter.urls
@@ -1,6 +1,6 @@
 http://localhost:9763/search.pz2?command=init
 http://localhost:9763/search.pz2?session=1&command=search&query=0+or+the
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=termlist&name=author,date,subject,xtargets
 http://localhost:9763/search.pz2?session=1&command=search&query=the%207&filter=pz%3Aid%3Dlocalhost%3A9999
 http://localhost:9763/search.pz2?session=1&command=show&block=1

diff --git a/test/test_gbv_de.urls b/test/test_gbv_de.urls
index e0d8137..ad3e375 100644 (file)
--- a/test/test_gbv_de.urls
+++ b/test/test_gbv_de.urls
@@ -1,7 +1,7 @@
 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
+w 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

diff --git a/test/test_http.urls b/test/test_http.urls
index 3b4f7e9..64619da 100644 (file)
--- a/test/test_http.urls
+++ b/test/test_http.urls
@@ -2,7 +2,7 @@ http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%
 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&snippets=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&snippets=1
 http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+title+how+to+program+a+computer+author+jack+collins+medium+book&snippets=1
 http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+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
@@ -15,52 +15,52 @@ 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
+w 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
+w 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=content%3A+title+how+to+program+a+computer+author+jack+collins+medium+book
+w http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+title+how+to+program+a+computer+author+jack+collins+medium+book
 http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+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=content%3A+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
+w 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
+w 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
+w 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
+w 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
+w http://localhost:9763/search.pz2?session=6&command=search&query=louis
+w http://localhost:9763/search.pz2?session=6&command=show&block=1
 http://localhost:9763/search.pz2?session=6&command=record&id=content%3A+title+computer+processing+of+dynamic+images+from+an+anger+scintillation+camera+author+medium+book&offset=0&nativesyntax=txml%3Bcharset%3Dmarc-8
 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&rank=title%3D9,author%3D7
-1 http://localhost:9763/search.pz2?session=6&command=show&block=1
+w http://localhost:9763/search.pz2?session=7&command=show&block=1&rank=title%3D9,author%3D7
+w http://localhost:9763/search.pz2?session=6&command=show&block=1
 http://localhost:9763/search.pz2?session=6&command=record&id=content%3A+title+computer+processing+of+dynamic+images+from+an+anger+scintillation+camera+author+medium+book&checksum=2614320583
 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
+w 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
+w http://localhost:9763/search.pz2?session=8&command=show&block=1
 http://localhost:9763/search.pz2?command=init&pz:limitmap:author%5Bz3950.indexdata.com%2Fmarc%5D=ccl:author_phrase&pz:limitmap:Mysubject%5Bz3950.indexdata.com%2fmarc%5D=local:subject&pz:limitmap:date%5Bz3950.indexdata.com%2fmarc%5D=local:
-1 http://localhost:9763/search.pz2?session=9&command=search&query=greece&limit=author%3DAdam\,+James%7Cother_author
-1 http://localhost:9763/search.pz2?session=9&command=show&block=1
+w http://localhost:9763/search.pz2?session=9&command=search&query=greece&limit=author%3DAdam\,+James%7Cother_author
+w http://localhost:9763/search.pz2?session=9&command=show&block=1
 http://localhost:9763/search.pz2?session=9&command=settings&pz:limitmap:author%5Bz3950.indexdata.com%2Fmarc%5D=rpn:%40attr+1%3D1003+%40attr+6%3D3
-1 http://localhost:9763/search.pz2?session=9&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author
-1 http://localhost:9763/search.pz2?session=9&command=show&block=1
+w http://localhost:9763/search.pz2?session=9&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author
+w http://localhost:9763/search.pz2?session=9&command=show&block=1
 http://localhost:9763/search.pz2?session=9&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author&filter=pz%3Aid%3Dz3950.indexdata.com%2Fmarc
 http://localhost:9763/search.pz2?session=9&command=bytarget
 http://localhost:9763/search.pz2?session=9&command=show

diff --git a/test/test_icu.urls b/test/test_icu.urls
index be4e983..fefa859 100644 (file)
--- a/test/test_icu.urls
+++ b/test/test_icu.urls
@@ -1,7 +1,7 @@
 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&snippets=1
+w http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:0&snippets=1
 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

diff --git a/test/test_limit_limitmap.urls b/test/test_limit_limitmap.urls
index 13e1155..0d77e59 100644 (file)
--- a/test/test_limit_limitmap.urls
+++ b/test/test_limit_limitmap.urls
@@ -1,39 +1,39 @@
 test_limit_limitmap_service.xml http://localhost:9763/search.pz2?command=init&service=limitmap
 test_limit_limitmap_settings_1.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w 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&block=1&name=xtargets%2Cauthor%2Csubject%2Cdate
 test_limit_limitmap_settings_2.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-10 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w 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&block=1&name=xtargets%2Cauthor%2Csubject%2Cdate
 http://localhost:9763/search.pz2?session=1&command=termlist&block=1&report=status&name=xtargets%2Cauthor%2Csubject%2Cdate
 http://localhost:9763/search.pz2?session=1&command=bytarget&report=status
-1 http://localhost:9763/search.pz2?session=1&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 test_limit_limitmap_settings_3.xml http://localhost:9763/search.pz2?session=1&command=settings
-1 http://localhost:9763/search.pz2?session=1&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author&filter=pz%3Aid%3DTarget-1
 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?session=1&command=show
 test_limit_limitmap_settings_4.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=Mysubject%3DRailroads
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=date%3D1977
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=Mysubject%3DRailroads
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=date%3D1977
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
 http://localhost:9763/search.pz2?session=1&command=termlist&block=1&version2=
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=date%3C1977
 http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
 http://localhost:9763/search.pz2?session=1&command=termlist&block=1&version=2
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=date%3D1977-1997
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
 http://localhost:9763/search.pz2?session=1&command=termlist&block=1&version2=
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=date%3C1977
 http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2

diff --git a/test/test_perf.urls b/test/test_perf.urls
index 60a342c..075674b 100644 (file)
--- a/test/test_perf.urls
+++ b/test/test_perf.urls
@@ -1,5 +1,5 @@
 http://localhost:9763/search.pz2?command=init&clear=1
 ztest_localhost_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=100+and+computer
-http://localhost:9763/search.pz2?session=1&command=show&block=1
+2 http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=termlist

diff --git a/test/test_perf_4.res b/test/test_perf_4.res
index dd96735..dc992a3 100644 (file)
--- a/test/test_perf_4.res
+++ b/test/test_perf_4.res
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <show><status>OK</status>
-<activeclients>1</activeclients>
-<merged>39</merged>
+<activeclients>0</activeclients>
+<merged>99</merged>
 <total>100</total>
 <start>0</start>
 <num>20</num>
@@ -16,7 +16,7 @@
   <md-description>Title from caption</md-description>
  </location>
  <count>1</count>
- <relevance>152547</relevance>
+ <relevance>55113</relevance>
  <recid>content: title internet world</recid>
 </hit>
 <hit>
@@ -33,7 +33,7 @@
   <md-author>Jack Collins</md-author>
  </location>
  <count>2</count>
- <relevance>91528</relevance>
+ <relevance>33068</relevance>
  <recid>content: title how to program a computer author jack collins</recid>
 </hit>
 <hit>
@@ -48,7 +48,7 @@
   <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
  </location>
  <count>1</count>
- <relevance>76273</relevance>
+ <relevance>27556</relevance>
  <recid>content: title the computer bible</recid>
 </hit>
 <hit>
@@ -62,11 +62,23 @@
   <md-date>1977</md-date>
  </location>
  <count>1</count>
- <relevance>57205</relevance>
+ <relevance>20667</relevance>
  <recid>content: title computer science technology</recid>
 </hit>
 <hit>
  <md-title>How to program a computer</md-title>
+ <md-author>Jack C100</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="4208086653">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C100</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c100</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
  <md-author>Jack C24</md-author>
  <location id="localhost:9999/db1"
     name="db1" checksum="341362961">
@@ -74,7 +86,7 @@
   <md-author>Jack C24</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c24</recid>
 </hit>
 <hit>
@@ -86,7 +98,7 @@
   <md-author>Jack C25</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c25</recid>
 </hit>
 <hit>
@@ -98,7 +110,7 @@
   <md-author>Jack C26</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c26</recid>
 </hit>
 <hit>
@@ -110,7 +122,7 @@
   <md-author>Jack C27</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c27</recid>
 </hit>
 <hit>
@@ -122,7 +134,7 @@
   <md-author>Jack C28</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c28</recid>
 </hit>
 <hit>
@@ -134,7 +146,7 @@
   <md-author>Jack C29</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c29</recid>
 </hit>
 <hit>
@@ -146,7 +158,7 @@
   <md-author>Jack C30</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c30</recid>
 </hit>
 <hit>
@@ -158,7 +170,7 @@
   <md-author>Jack C31</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c31</recid>
 </hit>
 <hit>
@@ -170,7 +182,7 @@
   <md-author>Jack C32</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c32</recid>
 </hit>
 <hit>
@@ -182,7 +194,7 @@
   <md-author>Jack C33</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c33</recid>
 </hit>
 <hit>
@@ -194,7 +206,7 @@
   <md-author>Jack C34</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c34</recid>
 </hit>
 <hit>
@@ -206,7 +218,7 @@
   <md-author>Jack C35</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c35</recid>
 </hit>
 <hit>
@@ -218,7 +230,7 @@
   <md-author>Jack C36</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c36</recid>
 </hit>
 <hit>
@@ -230,7 +242,7 @@
   <md-author>Jack C37</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c37</recid>
 </hit>
 <hit>
@@ -242,19 +254,7 @@
   <md-author>Jack C38</md-author>
  </location>
  <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
  <recid>content: title how to program a computer author jack c38</recid>
 </hit>
-<hit>
- <md-title>How to program a computer</md-title>
- <md-author>Jack C39</md-author>
- <location id="localhost:9999/db1"
-    name="db1" checksum="2008735752">
-  <md-title>How to program a computer</md-title>
-  <md-author>Jack C39</md-author>
- </location>
- <count>1</count>
- <relevance>45764</relevance>
- <recid>content: title how to program a computer author jack c39</recid>
-</hit>
 </show>
\ No newline at end of file

diff --git a/test/test_post.urls b/test/test_post.urls
index 3d14bc4..291591e 100644 (file)
--- a/test/test_post.urls
+++ b/test/test_post.urls
@@ -5,7 +5,7 @@ http://localhost:9763/search.pz2?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.pz2?session=3&command=settings
 http://localhost:9763/search.pz2?session=3&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 http://localhost:9763/search.pz2?session=2&command=show
-1 http://localhost:9763/search.pz2?session=3&command=show
+w http://localhost:9763/search.pz2?session=3&command=show
 http://localhost:9763/search.pz2?session=3&command=bytarget

diff --git a/test/test_preferred.urls b/test/test_preferred.urls
index 2d3fd52..c44b00d 100644 (file)
--- a/test/test_preferred.urls
+++ b/test/test_preferred.urls
@@ -1,16 +1,16 @@
 http://localhost:9763/search.pz2?command=init&clear=1
 cf_mit_opencourseware_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 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
+w 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
 ocs-loc_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 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
+w 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
 ocs-oaister_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 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
+w 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_rank.urls b/test/test_rank.urls
index b08b8a0..f1b0497 100644 (file)
--- a/test/test_rank.urls
+++ b/test/test_rank.urls
@@ -1,16 +1,16 @@
 http://localhost:9763/search.pz2?session=1&command=init
 test_rank_settings_1.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water&sort=relevance
-2 http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
+w http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
 http://localhost:9763/search.pz2?session=1&command=init
 test_rank_settings_2.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water&sort=relevance
-2 http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
+w http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
 http://localhost:9763/search.pz2?session=1&command=init
 test_rank_settings_3.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water&sort=relevance
-2 http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
+w http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
 http://localhost:9763/search.pz2?session=1&command=init
 test_rank_settings_4.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water&sort=relevance
-2 http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
+w http://localhost:9763/search.pz2?session=1&command=show&sort=relevance

diff --git a/test/test_settings.urls b/test/test_settings.urls
index 5188826..83c0241 100644 (file)
--- a/test/test_settings.urls
+++ b/test/test_settings.urls
@@ -4,5 +4,5 @@ http://localhost:9763/search.pz2?session=1&command=settings&category%5Bz3950.ind
 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
-1 http://localhost:9763/search.pz2?session=2&command=bytarget&settings=1
+w http://localhost:9763/search.pz2?session=1&command=bytarget&settings=1
+w http://localhost:9763/search.pz2?session=2&command=bytarget&settings=1

diff --git a/test/test_solr.urls b/test/test_solr.urls
index 80afe72..264cdc0 100644 (file)
--- a/test/test_solr.urls
+++ b/test/test_solr.urls
@@ -1,32 +1,32 @@
 http://localhost:9763/search.pz2?command=init&clear=1
 test_solr_settings_1.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-4 http://localhost:9763/search.pz2?session=1&command=show&block=preferred
+w http://localhost:9763/search.pz2?session=1&command=show&block=preferred
 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
 test_solr_settings_2.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-3 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
 test_solr_settings_3.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-5 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
 test_solr_settings_4.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water&maxrecs=200
-3 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
 http://localhost:9763/search.pz2?session=1&command=search&query=water&limit=subject%3DN.Y
-3 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 test_solr_settings_5.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-5 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
 http://localhost:9763/search.pz2?session=1&command=search&query=water&limit=subject%3DN.Y
-3 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 test_solr_settings_6.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=date%3D%3F&sort=date:1
 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=date:1

diff --git a/test/test_solr_spell.urls b/test/test_solr_spell.urls
index 0a42801..f358d6e 100644 (file)
--- a/test/test_solr_spell.urls
+++ b/test/test_solr_spell.urls
@@ -1,6 +1,6 @@
 http://localhost:9763/search.pz2?command=init&clear=1
 http://localhost:9763/search.pz2?session=1&command=settings&pz%3Atermlist_term_count%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=10&use_url_proxy%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Apiggyback%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Apreferred%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Acclmap%3Asu%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Asru%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=solr&use_thumbnails%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Acclmap%3Adate%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Ddate&medium%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=web&pz%3Aname%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=ocs_test&pz%3Acclmap%3Aissn%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=u%3D8&pz%3Acclmap%3Ati%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Aau%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Axslt%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Acclmap%3Aterm%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtext+s%3Dal&pz%3Acclmap%3Aisbn%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Aqueryencoding%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=UTF-8&pz%3Aextra_args%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=spellcheck=true
 http://localhost:9763/search.pz2?session=1&command=search&query=kingg
-2 http://localhost:9763/search.pz2?session=1&command=show&block=preferred
+w http://localhost:9763/search.pz2?session=1&command=show&block=preferred
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
 http://localhost:9763/search.pz2?session=1&command=bytarget

diff --git a/test/test_sort.urls b/test/test_sort.urls
index f465378..bccdc0d 100644 (file)
--- a/test/test_sort.urls
+++ b/test/test_sort.urls
@@ -1,7 +1,7 @@
 http://localhost:9763/search.pz2?session=1&command=init
 test_sort_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-3 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
 http://localhost:9763/search.pz2?session=1&command=search&query=water&sort=position:1
@@ -11,4 +11,4 @@ http://localhost:9763/search.pz2?session=1&command=show&start=40&block=prefered&
 http://localhost:9763/search.pz2?session=2&command=init
 test_sort_settings.xml http://localhost:9763/search.pz2?session=2&command=settings
 http://localhost:9763/search.pz2?session=2&command=search&query=water
-http://localhost:9763/search.pz2?session=1&command=show&start=60&block=prefered&sort=date
\ No newline at end of file
+http://localhost:9763/search.pz2?session=1&command=show&start=60&block=prefered&sort=date

diff --git a/test/test_sru-proxy.urls b/test/test_sru-proxy.urls
index 6f8276e..3adc833 100644 (file)
--- a/test/test_sru-proxy.urls
+++ b/test/test_sru-proxy.urls
@@ -1,17 +1,17 @@
 http://localhost:9763/search.pz2?command=init&service=sru-proxy
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cmedium%2Cjournal-title
 http://localhost:9763/search.pz2?session=1&command=search&query=water%20and%20su%3D%22Research%22
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 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:query_syntax%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=pqf&pz%3Aextra_args%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=%26x-facet_def%3Ddtic_test%26x-noxsl%3D1
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%%2Cmedium%2Cjournal-title
 http://localhost:9763/search.pz2?session=1&command=search&query=water%20and%20jt%3D%22Forbes%22
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=water%20and%20au%3D%22Janmaat,%20Johannus%22
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cmedium%2Cjournal-title
 http://localhost:9763/search.pz2?session=1&command=search&query=water%20and%20su%3D%22Research%22
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1

diff --git a/test/test_sru.urls b/test/test_sru.urls
index c6d5324..dba2c69 100644 (file)
--- a/test/test_sru.urls
+++ b/test/test_sru.urls
@@ -1,3 +1,3 @@
 sru_service.xml http://localhost:9763/search.pz2?command=init&service=sru
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-1 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show

diff --git a/test/test_termlist_block.urls b/test/test_termlist_block.urls
index e324fb0..ed0910f 100644 (file)
--- a/test/test_termlist_block.urls
+++ b/test/test_termlist_block.urls
@@ -1,12 +1,12 @@
 http://localhost:9763/search.pz2?command=init&clear=1
 ztest_localhost_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w 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&block=1&name=xtargets%2Cauthor%2Csubject%2Cdate
 test_termlist_block_settings_2.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w 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&block=1&name=xtargets%2Cauthor%2Csubject%2Cdate
 http://localhost:9763/search.pz2?session=1&command=termlist&block=1&report=status&name=xtargets%2Cauthor%2Csubject%2Cdate

diff --git a/test/test_turbomarcxml.urls b/test/test_turbomarcxml.urls
index 7d2b76c..86548ed 100644 (file)
--- a/test/test_turbomarcxml.urls
+++ b/test/test_turbomarcxml.urls
@@ -1,8 +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
+w 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
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=bytarget

diff --git a/test/test_url.urls b/test/test_url.urls
index 6694fe6..505121c 100644 (file)
--- a/test/test_url.urls
+++ b/test/test_url.urls
@@ -1,23 +1,23 @@
 http://localhost:9763/search.pz2?command=init&clear=1&pz:elements%5Bmy%5D=F&pz:requestsyntax%5Bmy%5D=usmarc&pz:nativesyntax%5Bmy%5D=iso2709&pz:xslt%5Bmy%5D=marc21_test.xsl&pz:name%5Bmy%5D=marcserver&pz:url%5Bmy%5D=z3950.indexdata.com%2Fmarc
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 test_url_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=the&maxrecs=3
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:1
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:1
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:0
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:0
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:0
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:0
 http://localhost:9763/search.pz2?command=init&clear=1&pz:elements%5Bmy%5D=F&pz:requestsyntax%5Bmy%5D=usmarc&pz:nativesyntax%5Bmy%5D=iso2709&pz:xslt%5Bmy%5D=marc21_test.xsl&pz:name%5Bmy%5D=marcserver&pz:url%5Bmy%5D=z3950.unknown.indexdata.com%2Fmarc
 http://localhost:9763/search.pz2?session=2&command=search&query=fail
 http://localhost:9763/search.pz2?command=init&clear=1&pz:elements%5Bmy%5D=F&pz:requestsyntax%5Bmy%5D=usmarc&pz:nativesyntax%5Bmy%5D=iso2709&pz:xslt%5Bmy%5D=marc21_test.xsl&pz:name%5Bmy%5D=marcserver&pz:url%5Bmy%5D=z3950.indexdata.com%2Fmarc&pz:pqf_strftime%5Bmy%5D=fail+%25%25
 http://localhost:9763/search.pz2?session=3&command=search&query=fail
 test_url_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:1p
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=date:0p
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:1p
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=date:0p
 http://localhost:9763/search.pz2?session=1&command=service
 http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
 http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+title+coal+sample+bank+author+medium+book
 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:1
-http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+title+coal+sample+bank+author+medium+book
\ No newline at end of file
+http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+title+coal+sample+bank+author+medium+book