Fix limit_limimtap test. Wait for all records from Solr

rather than wait for "some".. Which is unreliable and depending
on timing, etc.

diff --git a/test/test_limit_limitmap.urls b/test/test_limit_limitmap.urls
index a986e6b..e40b12d 100644 (file)
--- a/test/test_limit_limitmap.urls
+++ b/test/test_limit_limitmap.urls
@@ -21,6 +21,6 @@ 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
-http://localhost:9763/search.pz2?session=1&command=show&block=1
+1 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
-http://localhost:9763/search.pz2?session=1&command=show&block=1
\ No newline at end of file
+http://localhost:9763/search.pz2?session=1&command=show&block=1

diff --git a/test/test_limit_limitmap_24.res b/test/test_limit_limitmap_24.res
index 9f9ccad..64ca61c 100644 (file)
--- a/test/test_limit_limitmap_24.res
+++ b/test/test_limit_limitmap_24.res
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <show><status>OK</status>
-<activeclients>2</activeclients>
-<merged>60</merged>
-<total>2015</total>
+<activeclients>0</activeclients>
+<merged>109</merged>
+<total>2025</total>
 <start>0</start>
 <num>20</num>
 <hit>
@@ -15,7 +15,7 @@
 <md-title-remainder>fast &amp; easy</md-title-remainder>
 <md-date>2001</md-date>
 <md-author>Woodward, C. Michael</md-author></location>
-<relevance>30776</relevance>
+<relevance>45304</relevance>
 <recid>content: title adobe illustrator for the mac author woodward c michael</recid>
 </hit>
 <hit>
@@ -24,7 +24,7 @@
 <md-date>1998</md-date><location id="Target-2" name="LOC-SOLR">
 <md-title>Advanced computer performance modeling and simulation</md-title>
 <md-date>1998</md-date></location>
-<relevance>30776</relevance>
+<relevance>45304</relevance>
 <recid>content: title advanced computer performance modeling and simulation</recid>
 </hit>
 <hit>
@@ -39,7 +39,7 @@
 <md-date>2000</md-date>
 <md-author>Aldrich, Richard W</md-author>
 <md-description>&quot;April 2000.&quot;</md-description></location>
-<relevance>30776</relevance>
+<relevance>45304</relevance>
 <recid>content: title cyberterrorism and computer crimes author aldrich richard w</recid>
 </hit>
 <hit>
@@ -52,7 +52,7 @@
 <md-title-remainder>talks with Bonnie Nardi, Jakob Nielsen, David Smith, Austin Henderson &amp; Jed Harris, Terry Winograd, Stephanie Rosenbaum</md-title-remainder>
 <md-date>2000</md-date>
 <md-author>Kaasgaard, Klaus</md-author></location>
-<relevance>28211</relevance>
+<relevance>41529</relevance>
 <recid>content: title software design and usability author kaasgaard klaus</recid>
 </hit>
 <hit>
@@ -65,11 +65,22 @@
 <md-date>2000</md-date>
 <md-author>Knittel, John</md-author>
 <md-description>Explains what computer hacking is, who does it, and how dangerous it can be</md-description></location>
-<relevance>26979</relevance>
+<relevance>39715</relevance>
 <recid>content: title everything you need to know about the dangers of computer hacking author knittel john</recid>
 </hit>
 <hit>
 
+<md-title>Computer peripherals</md-title>
+<md-date>1995</md-date>
+<md-author>Cook, Barry M</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Computer peripherals</md-title>
+<md-date>1995</md-date>
+<md-author>Cook, Barry M</md-author></location>
+<relevance>39641</relevance>
+<recid>content: title computer peripherals author cook barry m</recid>
+</hit>
+<hit>
+
 <md-title>Kids&apos; computer book</md-title>
 <md-date>1994</md-date>
 <md-description>Discusses a variety of educational and game software for children  with suggestions for setting up a computer system. Includes a 3 1/2 in. disk with 6 shareware programs for children</md-description><location id="Target-2" name="LOC-SOLR">
@@ -77,7 +88,7 @@
 <md-date>1994</md-date>
 <md-description>&quot;For kids and their parents&quot;--Cover</md-description>
 <md-description>Discusses a variety of educational and game software for children  with suggestions for setting up a computer system. Includes a 3 1/2 in. disk with 6 shareware programs for children</md-description></location>
-<relevance>23651</relevance>
+<relevance>34817</relevance>
 <recid>content: title kids computer book</recid>
 </hit>
 <hit>
@@ -88,7 +99,7 @@
 <md-title>Computer friendly</md-title>
 <md-date>1999</md-date>
 <md-author>Steinbacher, Raymond</md-author></location>
-<relevance>23082</relevance>
+<relevance>33978</relevance>
 <recid>content: title computer friendly author steinbacher raymond</recid>
 </hit>
 <hit>
@@ -101,11 +112,37 @@
 <md-description>&quot;May 1999.&quot;</md-description>
 <md-description>&quot;NZLC R54&quot;--T.p. verso</md-description>
 <md-description>&quot;Also published as Parliamentary Paper E 31AO&quot;--T.p. verso</md-description></location>
-<relevance>23082</relevance>
+<relevance>33978</relevance>
 <recid>content: title computer misuse</recid>
 </hit>
 <hit>
 
+<md-title>Computer networking</md-title>
+<md-title-remainder>a top-down approach featuring the Internet</md-title-remainder>
+<md-date>2001</md-date>
+<md-author>Ross, Keith W</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Computer networking</md-title>
+<md-title-remainder>a top-down approach featuring the Internet</md-title-remainder>
+<md-date>2001</md-date>
+<md-author>Ross, Keith W</md-author></location>
+<relevance>33978</relevance>
+<recid>content: title computer networking author ross keith w</recid>
+</hit>
+<hit>
+
+<md-title>CorelDRAW 8 for Windows</md-title>
+<md-date>1998</md-date>
+<md-author>Davis, Phyllis</md-author>
+<md-description>Includes index</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>CorelDRAW 8 for Windows</md-title>
+<md-date>1998</md-date>
+<md-author>Davis, Phyllis</md-author>
+<md-description>Includes index</md-description></location>
+<relevance>33978</relevance>
+<recid>content: title coreldraw for windows author davis phyllis</recid>
+</hit>
+<hit>
+
 <md-title>Quicken 2000 for the Mac</md-title>
 <md-title-remainder>the official guide</md-title-remainder>
 <md-date>2000</md-date>
@@ -117,11 +154,20 @@
 <md-author>Langer, Maria</md-author>
 <md-description>Includes index</md-description>
 <md-description>&quot;Covers Quicken deluxe 2000 for the Mac&quot;--Cover</md-description></location>
-<relevance>23082</relevance>
+<relevance>33978</relevance>
 <recid>content: title quicken for the mac author langer maria</recid>
 </hit>
 <hit>
 
+<md-title>Sicherheit und Schutz im Netz</md-title>
+<md-date>1998</md-date><location id="Target-2" name="LOC-SOLR">
+<md-title>Sicherheit und Schutz im Netz</md-title>
+<md-date>1998</md-date></location>
+<relevance>33978</relevance>
+<recid>content: title sicherheit und schutz im netz</recid>
+</hit>
+<hit>
+
 <md-title>Unix Secure Shell</md-title>
 <md-date>1999</md-date>
 <md-author>Carasik, Anne H</md-author>
@@ -130,7 +176,7 @@
 <md-date>1999</md-date>
 <md-author>Carasik, Anne H</md-author>
 <md-description>Includes index</md-description></location>
-<relevance>23082</relevance>
+<relevance>33978</relevance>
 <recid>content: title unix secure shell author carasik anne h</recid>
 </hit>
 <hit>
@@ -143,11 +189,24 @@
 <md-title-remainder>proceedings, 11-13 October 1999, Boston, Massachusetts</md-title-remainder>
 <md-date>1999</md-date>
 <md-description>&quot;IEEE catalog number 99EX370&quot;--T.p. verso</md-description></location>
-<relevance>21799</relevance>
+<relevance>32090</relevance>
 <recid>content: title eight international conference on computer communications and networks</recid>
 </hit>
 <hit>
 
+<md-title>Building storage networks</md-title>
+<md-date>2000</md-date>
+<md-author>Farley, Marc</md-author>
+<md-description>Includes index</md-description><location id="Target-2" name="LOC-SOLR">
+<md-title>Building storage networks</md-title>
+<md-date>2000</md-date>
+<md-author>Farley, Marc</md-author>
+<md-description>Includes index</md-description></location>
+<relevance>30203</relevance>
+<recid>content: title building storage networks author farley marc</recid>
+</hit>
+<hit>
+
 <md-title>Complete CL</md-title>
 <md-title-remainder>the definitive control language programming guide</md-title-remainder>
 <md-date>1999</md-date>
@@ -158,7 +217,7 @@
 <md-date>1999</md-date>
 <md-author>Malaga, Ernie</md-author>
 <md-description>Includes index</md-description></location>
-<relevance>20517</relevance>
+<relevance>30203</relevance>
 <recid>content: title complete cl author malaga ernie</recid>
 </hit>
 <hit>
@@ -171,11 +230,22 @@
 <md-title-remainder>real-time rendering and software technology</md-title-remainder>
 <md-date>2001</md-date>
 <md-author>Watt, Alan H</md-author></location>
-<relevance>20517</relevance>
+<relevance>30203</relevance>
 <recid>content: title d games author watt alan h</recid>
 </hit>
 <hit>
 
+<md-title>Java applications strategies for the AS/400</md-title>
+<md-date>1999</md-date>
+<md-author>Denoncourt, Don</md-author><location id="Target-2" name="LOC-SOLR">
+<md-title>Java applications strategies for the AS/400</md-title>
+<md-date>1999</md-date>
+<md-author>Denoncourt, Don</md-author></location>
+<relevance>30203</relevance>
+<recid>content: title java applications strategies for the as author denoncourt don</recid>
+</hit>
+<hit>
+
 <md-title>Mastering algorithms with C</md-title>
 <md-date>1999</md-date>
 <md-author>Loudon, Kyle</md-author>
@@ -185,73 +255,7 @@
 <md-author>Loudon, Kyle</md-author>
 <md-description>&quot;Useful techniques from sorting to encryption&quot;--Cover</md-description>
 <md-description>Includes index</md-description></location>
-<relevance>20517</relevance>
+<relevance>30203</relevance>
 <recid>content: title mastering algorithms with c author loudon kyle</recid>
 </hit>
-<hit>
-
-<md-title>Programming Web graphics with PERL and GNU software</md-title>
-<md-date>1999</md-date>
-<md-author>Wallace, Shawn P</md-author><location id="Target-2" name="LOC-SOLR">
-<md-title>Programming Web graphics with PERL and GNU software</md-title>
-<md-date>1999</md-date>
-<md-author>Wallace, Shawn P</md-author></location>
-<relevance>20517</relevance>
-<recid>content: title programming web graphics with perl and gnu software author wallace shawn p</recid>
-</hit>
-<hit>
-
-<md-title>4th ACM Conference on Computer and Communications Security, April 1-4, 1997, Zurich, Switzerland</md-title>
-<md-date>1997</md-date><location id="Target-2" name="LOC-SOLR">
-<md-title>4th ACM Conference on Computer and Communications Security, April 1-4, 1997, Zurich, Switzerland</md-title>
-<md-date>1997</md-date></location>
-<relevance>18185</relevance>
-<recid>content: title th acm conference on computer and communications security april zurich switzerland</recid>
-</hit>
-<hit>
-
-<md-title>3D computer graphics</md-title>
-<md-date>2000</md-date>
-<md-author>Watt, Alan H</md-author><location id="Target-2" name="LOC-SOLR">
-<md-title>3D computer graphics</md-title>
-<md-date>2000</md-date>
-<md-author>Watt, Alan H</md-author></location>
-<relevance>17952</relevance>
-<recid>content: title d computer graphics author watt alan h</recid>
-</hit>
-<hit>
-
-<md-title>Insanely great</md-title>
-<md-title-remainder>the life and times of Macintosh, the computer that changed everything</md-title-remainder>
-<md-date>2000</md-date>
-<md-author>Levy, Steven</md-author><location id="Target-2" name="LOC-SOLR">
-<md-title>Insanely great</md-title>
-<md-title-remainder>the life and times of Macintosh, the computer that changed everything</md-title-remainder>
-<md-date>2000</md-date>
-<md-author>Levy, Steven</md-author></location>
-<relevance>17719</relevance>
-<recid>content: title insanely great author levy steven</recid>
-</hit>
-<hit>
-
-<md-title>Careers in computer animation</md-title>
-<md-date>2001</md-date>
-<md-author>Shires, Jeremy</md-author><location id="Target-2" name="LOC-SOLR">
-<md-title>Careers in computer animation</md-title>
-<md-date>2001</md-date>
-<md-author>Shires, Jeremy</md-author></location>
-<relevance>15388</relevance>
-<recid>content: title careers in computer animation author shires jeremy</recid>
-</hit>
-<hit>
-
-<md-title>Hackers beware</md-title>
-<md-date>2002</md-date>
-<md-author>Cole, Eric</md-author><location id="Target-2" name="LOC-SOLR">
-<md-title>Hackers beware</md-title>
-<md-date>2002</md-date>
-<md-author>Cole, Eric</md-author></location>
-<relevance>15388</relevance>
-<recid>content: title hackers beware author cole eric</recid>
-</hit>
 </show>
\ No newline at end of file