From 92573b4e8048b243a9cb2051912595240669e037 Mon Sep 17 00:00:00 2001
From: Dennis Schafroth <dennis@indexdata.com>
Date: Fri, 12 Apr 2013 12:39:52 +0200
Subject: [PATCH] Remove the /select on Solr urls. Yaz appends handler
 depending if it is search or scan

---
 test/ocs-loc_settings.xml               |    6 +++---
 test/ocs-oaister_settings.xml           |    4 ++--
 test/test_limit_limitmap_settings_2.xml |    2 +-
 test/test_solr_settings_1.xml           |    4 ++--
 test/test_sort.urls                     |    5 ++++-
 test/test_sort_settings.xml             |    2 +-
 test/test_termlist_block_settings_2.xml |    6 +++---
 7 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/test/ocs-loc_settings.xml b/test/ocs-loc_settings.xml
index 278cf19..5ca8194 100644
--- a/test/ocs-loc_settings.xml
+++ b/test/ocs-loc_settings.xml
@@ -1,6 +1,6 @@
-<settings target="ocs-loc.indexdata.com/solr/select">
+<settings target="ocs-loc.indexdata.com/solr">
   <set name="pz:name"                value="LOC (SOLR)" />
-  <set name="pz:url"                 value="ocs-loc.indexdata.com/solr/select"/>
+  <set name="pz:url"                 value="ocs-loc.indexdata.com/solr"/>
   <set name="pz:sru"                 value="solr" />
   <set name="full_text_target"       value="NO" />
   <set name="pz:termlist_term_count" value="10" />
@@ -17,4 +17,4 @@
   <set name="pz:xslt"                value="solr-pz2.xsl" />
   <set name="use_thumbnails"         value="0" />
   <set name="use_url_proxy"          value="0" />
-</settings>
\ No newline at end of file
+</settings>
diff --git a/test/ocs-oaister_settings.xml b/test/ocs-oaister_settings.xml
index 39c0077..e6a821f 100644
--- a/test/ocs-oaister_settings.xml
+++ b/test/ocs-oaister_settings.xml
@@ -1,6 +1,6 @@
 <settings target="ocs-oaister.indexdata.com/solr">
   <set name="pz:name"                value="Oaister (SOLR)" />
-  <set name="pz:url"                 value="ocs-loc.indexdata.com/solr/select"/>
+  <set name="pz:url"                 value="ocs-loc.indexdata.com/solr"/>
   <set name="pz:sru"                 value="solr" />
   <set name="full_text_target"       value="NO" />
   <set name="pz:termlist_term_count" value="10" />
@@ -18,4 +18,4 @@
   <set name="pz:xslt"                value="solr-pz2.xsl" />
   <set name="use_thumbnails"         value="0" />
   <set name="use_url_proxy"          value="0" />
-</settings>
\ No newline at end of file
+</settings>
diff --git a/test/test_limit_limitmap_settings_2.xml b/test/test_limit_limitmap_settings_2.xml
index 656062a..580060a 100644
--- a/test/test_limit_limitmap_settings_2.xml
+++ b/test/test_limit_limitmap_settings_2.xml
@@ -1,7 +1,7 @@
 <!-- Solr target -->
 <settings target="Target-2">
   <set name="pz:name"  value="LOC-SOLR" />
-  <set name="pz:url"   value="ocs-test.indexdata.com/solr/select" />
+  <set name="pz:url"   value="ocs-test.indexdata.com/solr" />
 
   <set name="pz:limitmap:author"  value="ccl:author_phrase" />
   <set name="pz:limitmap:subject" value="rpn:@attr 1=subject_exact" />
diff --git a/test/test_solr_settings_1.xml b/test/test_solr_settings_1.xml
index b53f55a..79a56f6 100644
--- a/test/test_solr_settings_1.xml
+++ b/test/test_solr_settings_1.xml
@@ -1,7 +1,7 @@
 <!-- Solr target -->
 <settings target="LOC Solr Test">
   <set name="pz:name"  value="LOC Solr Test" />
-  <set name="pz:url"   value="ocs-test.indexdata.com/solr/select" />
+  <set name="pz:url"   value="ocs-test.indexdata.com/solr" />
 
   <set name="pz:limitmap:author"  value="rpn:@attr 1=author_exact 6=3" />
   <set name="pz:limitmap:subject" value="rpn:@attr 1=subject_exact" />
@@ -37,4 +37,4 @@
   <set name="use_thumbnails" value="0" />
   <set name="pz:queryencoding"  value="UTF-8" />
 
-</settings>
\ No newline at end of file
+</settings>
diff --git a/test/test_sort.urls b/test/test_sort.urls
index f465378..b7c0392 100644
--- a/test/test_sort.urls
+++ b/test/test_sort.urls
@@ -11,4 +11,7 @@ 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=1&block=prefered&sort=date
+http://localhost:9763/search.pz2?session=1&command=show&start=20&block=prefered&sort=date
+4 http://localhost:9763/search.pz2?session=1&command=show&start=200&block=prefered&sort=date
+4 http://localhost:9763/search.pz2?session=1&command=show&start=200&block=prefered&sort=date
diff --git a/test/test_sort_settings.xml b/test/test_sort_settings.xml
index 3cb9c71..e310717 100644
--- a/test/test_sort_settings.xml
+++ b/test/test_sort_settings.xml
@@ -1,7 +1,7 @@
 <!-- Solr target -->
 <settings target="LOC Solr Test">
   <set name="pz:name"  value="LOC Solr Test" />
-  <set name="pz:url"   value="ocs-test.indexdata.com/solr/select" />
+  <set name="pz:url"   value="ocs-test.indexdata.com/solr" />
 
   <set name="pz:limitmap:author"  value="rpn:@attr 1=author_exact 6=3" />
   <set name="pz:limitmap:subject" value="rpn:@attr 1=subject_exact" />
diff --git a/test/test_termlist_block_settings_2.xml b/test/test_termlist_block_settings_2.xml
index 93b7718..d807dc9 100644
--- a/test/test_termlist_block_settings_2.xml
+++ b/test/test_termlist_block_settings_2.xml
@@ -1,7 +1,7 @@
 <!-- Solr target -->
 <settings target="id_solr">
-  <set name="pz:name"  value="LOC (SOLR)" />
-  <set name="pz:url"   value="ocs-test.indexdata.com/solr/select" />
+  <set name="pz:name"  value="LOC Subset (SOLR)" />
+  <set name="pz:url"   value="ocs-test.indexdata.com/solr" />
 
   <set name="pz:cclmap:term"  value="1=text s=Dal" />
   <set name="pz:cclmap:au"    value="1=author"   />
@@ -36,4 +36,4 @@
   <set name="use_thumbnails" value="0"        />
   <set name="pz:queryencoding"  value="UTF-8" />
 
-</settings>
\ No newline at end of file
+</settings>
-- 
1.7.10.4