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

diff --git a/src/client.c b/src/client.c
index 44ee5d5..54d5f51 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -1414,7 +1414,7 @@ int client_parse_sort(struct client *cl, struct reclist_sortparms *sp)
                 cl->sort_criteria = 0;
             }
         } else {
-            yaz_log(YLOG_LOG, "Client %s: No sort strategy and spec found.", client_get_id(cl));
+            yaz_log(YLOG_DEBUG, "Client %s: No sort strategy and spec found.", client_get_id(cl));
             xfree(cl->sort_strategy);
             cl->sort_strategy  = 0;
             xfree(cl->sort_criteria);

diff --git a/test/test_filter.cfg b/test/test_filter.cfg
index afa0e19..27c8c2c 100644 (file)
--- a/test/test_filter.cfg
+++ b/test/test_filter.cfg
@@ -11,7 +11,7 @@
 
     <service>
       <settings target="*">
-        <set target="localhost:9999/Slow" name="pz:name" value="ztest slow"/>
+        <set target="localhost:9999" name="pz:name" value="ztest slow"/>
         <set target="z3950.indexdata.com/marc" name="pz:name" value="Index Data MARC test server"/>
         <set name="pz:cclmap:term" value="u=1016 t=l,r s=al"/>
         <set name="pz:cclmap:ti" value="u=4 s=al"/>

diff --git a/test/test_filter.urls b/test/test_filter.urls
index 057edb9..2924132 100644 (file)
--- a/test/test_filter.urls
+++ b/test/test_filter.urls
@@ -1,17 +1,17 @@
 http://localhost:9763/search.pz2?command=init
-http://localhost:9763/search.pz2?session=1&command=search&query=the
+http://localhost:9763/search.pz2?session=1&command=search&query=0+or+the
 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%2FSlow
+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
 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%2FSlow
+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
 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&filter=pz%3Aid%3Dz3950.indexdata.com%2Fmarc
 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?command=init
-http://localhost:9763/search.pz2?session=2&command=search&query=the%2022&filter=pz%3Aid%3Dlocalhost%3A9999%2FSlow
+http://localhost:9763/search.pz2?session=2&command=search&query=the%2022&filter=pz%3Aid%3Dlocalhost%3A9999
 http://localhost:9763/search.pz2?session=2&command=show&sort=title:0&block=1
 http://localhost:9763/search.pz2?session=2&command=show&sort=title:0&block=1

diff --git a/test/test_filter_10.res b/test/test_filter_10.res
index ae1d3a0..59210ec 100644 (file)
--- a/test/test_filter_10.res
+++ b/test/test_filter_10.res
@@ -23,7 +23,7 @@
 </list>
 <list name="xtargets">
 <term>
-<id>localhost:9999/Slow</id>
+<id>localhost:9999</id>
 <name>ztest slow</name>
 <frequency>7</frequency>
 <state>Client_Idle</state>

diff --git a/test/test_filter_16.res b/test/test_filter_16.res
index e290d20..20cc9d5 100644 (file)
--- a/test/test_filter_16.res
+++ b/test/test_filter_16.res
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <show><status>OK</status>
-<activeclients>1</activeclients>
-<merged>19</merged>
+<activeclients>0</activeclients>
+<merged>21</merged>
 <total>22</total>
 <start>0</start>
-<num>19</num>
+<num>20</num>
 <hit>
  <md-title>Washington metropolitan area rail computer feasibility study;</md-title>
  <md-title-remainder>final report</md-title-remainder>
@@ -12,8 +12,8 @@
  <md-author>Englund, Carl R</md-author>
  <md-subject>Railroads</md-subject>
  <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1963026620">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="2197542824">
   <md-title>Washington metropolitan area rail computer feasibility study;</md-title>
   <md-title-remainder>final report</md-title-remainder>
   <md-date>1971</md-date>
@@ -29,8 +29,8 @@
  <md-date>1977</md-date>
  <md-author>Wood, Helen M</md-author>
  <md-subject>Computers</md-subject>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1216306911">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="2708909695">
   <md-title>The use of passwords for controlled access to computer resources</md-title>
   <md-date>1977</md-date>
   <md-author>Wood, Helen M</md-author>
@@ -46,8 +46,8 @@
  <md-subject>Educational technology</md-subject>
  <md-subject>Federal aid to education</md-subject>
  <md-description>&quot;This directory was developed by the Technology for the National Diffusion Network Project, Teachers College, Columbia University pursuant to contract number OE-300-83-0253, U.S. Department of Education&quot;--T.p. verso</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="93569409">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="1890208281">
   <md-title>Technology programs that work</md-title>
   <md-date>1984</md-date>
   <md-subject>United States</md-subject>
@@ -70,8 +70,8 @@
  <md-subject>Philosophy, Ancient</md-subject>
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="4203185747">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="663442211">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
@@ -90,8 +90,8 @@
  <md-date>1977</md-date>
  <md-subject>Tomography</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="4017834789">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="3731643437">
   <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine</md-title>
   <md-title-remainder>proceedings of the workshop</md-title-remainder>
   <md-date>1977</md-date>
@@ -109,8 +109,8 @@
  <md-subject>Cartography</md-subject>
  <md-subject>Puget Sound region (Wash.)</md-subject>
  <md-description>Scale of maps ca. 1:1,000,000</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="3271115080">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="4243010308">
   <md-title>The Puget Sound Region</md-title>
   <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
   <md-date>1974</md-date>
@@ -129,8 +129,8 @@
  <md-subject>Universities and colleges</md-subject>
  <md-subject>Community colleges</md-subject>
  <md-description>Cover title</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="2709746329">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="1686175953">
   <md-title>A plan for community college computer development</md-title>
   <md-date>1971</md-date>
   <md-subject>Universities and colleges</md-subject>
@@ -141,6 +141,26 @@
  <recid>content: title a plan for community college computer development author medium book</recid>
 </hit>
 <hit>
+ <md-title>National dissemination model for the I&apos;M SPECIAL Program of Physical Education for the Handicapped, 1983-1986</md-title>
+ <md-title-remainder>final report, I&apos;M SPECIAL network</md-title-remainder>
+ <md-date>1986</md-date>
+ <md-subject>Physical education</md-subject>
+ <md-subject>Handicapped children</md-subject>
+ <md-description>Distributed to depository libraries in microfiche</md-description>
+ <location id="localhost:9999"
+    name="ztest slow" checksum="4139708093">
+  <md-title>National dissemination model for the I&apos;M SPECIAL Program of Physical Education for the Handicapped, 1983-1986</md-title>
+  <md-title-remainder>final report, I&apos;M SPECIAL network</md-title-remainder>
+  <md-date>1986</md-date>
+  <md-subject>Physical education</md-subject>
+  <md-subject>Handicapped children</md-subject>
+  <md-description tag="533">Microfiche</md-description>
+  <md-description tag="500">Distributed to depository libraries in microfiche</md-description>
+ </location>
+ <count>1</count>
+ <recid>content: title national dissemination model for the i m special program of physical education for the handicapped author medium</recid>
+</hit>
+<hit>
  <md-title>The late shift</md-title>
  <md-title-remainder>Letterman, Leno, and the network battle for the night</md-title-remainder>
  <md-date>1993</md-date>
@@ -150,8 +170,8 @@
  <md-subject>Leno, Jay</md-subject>
  <md-subject>Talk shows</md-subject>
  <md-description>Includes index</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="2895097287">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="2912942023">
   <md-title>The late shift</md-title>
   <md-title-remainder>Letterman, Leno, and the network battle for the night</md-title-remainder>
   <md-date>1993</md-date>
@@ -174,8 +194,8 @@
  <md-subject>Computer Systems</md-subject>
  <md-subject>Online Systems</md-subject>
  <md-description>Title from caption</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1401657869">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="3935675765">
   <md-title>Internet world</md-title>
   <md-date>1992</md-date>
   <md-subject>Internet (Computer network)</md-subject>
@@ -195,8 +215,8 @@
  <md-subject>Internet (Computer network)</md-subject>
  <md-subject>Mailing lists</md-subject>
  <md-description>Includes index</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="3641816996">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="2401575152">
   <md-title>Internet</md-title>
   <md-title-remainder>mailing lists</md-title-remainder>
   <md-date>1993</md-date>
@@ -211,8 +231,8 @@
  <md-title>Info Canada</md-title>
  <md-date>1991</md-date>
  <md-description>Includes: Network world Canada, Sept. 1991-Jan. 1992</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="2148377578">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="3424308894">
   <md-title>Info Canada</md-title>
   <md-date>1991</md-date>
   <md-description tag="500">Title from caption</md-description>
@@ -224,13 +244,13 @@
 <hit>
  <md-title>How to program a computer</md-title>
  <md-author>Jack Collins</md-author>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1030955953">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="1482143625">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
  </location>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="284236244">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="1993510496">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
  </location>
@@ -243,8 +263,8 @@
  <md-date>1980</md-date>
  <md-author>Smith, George Adam</md-author>
  <md-subject>Bible</md-subject>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="654938160">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="152075340">
   <md-title>Four psalms</md-title>
   <md-title-remainder>XXIII, XXXVI, LII, CXXI</md-title-remainder>
   <md-date>1980</md-date>
@@ -263,8 +283,8 @@
  <md-subject>Library information networks</md-subject>
  <md-subject>Libraries, Governmental, administrative, etc</md-subject>
  <md-description>Description based on: 1990</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1587008827">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="867474539">
   <md-title>FEDLINK services directory for fiscal year</md-title>
   <md-subject>FEDLINK (Network)</md-subject>
   <md-subject>Library information networks</md-subject>
@@ -280,8 +300,8 @@
  <md-author>Oberst, Bruce</md-author>
  <md-subject>Bible. O.T. Deuteronomy</md-subject>
  <md-description>Bibliography: p. 449-452</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="3456466038">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="1174809082">
   <md-title>Deuteronomy</md-title>
   <md-date>1968</md-date>
   <md-author>Oberst, Bruce</md-author>
@@ -292,12 +312,32 @@
  <recid>content: title deuteronomy author oberst bruce medium book</recid>
 </hit>
 <hit>
+ <md-title>Dealing with dropouts</md-title>
+ <md-title-remainder>the urban superintendents&apos; call to action</md-title-remainder>
+ <md-date>1987</md-date>
+ <md-author>Paulu, Nancy</md-author>
+ <md-subject>Dropouts</md-subject>
+ <md-description>Distributed to depository libraries in microfiche</md-description>
+ <location id="localhost:9999"
+    name="ztest slow" checksum="356107668">
+  <md-title>Dealing with dropouts</md-title>
+  <md-title-remainder>the urban superintendents&apos; call to action</md-title-remainder>
+  <md-date>1987</md-date>
+  <md-author>Paulu, Nancy</md-author>
+  <md-subject>Dropouts</md-subject>
+  <md-description tag="533">Microfiche</md-description>
+  <md-description tag="500">Distributed to depository libraries in microfiche</md-description>
+ </location>
+ <count>1</count>
+ <recid>content: title dealing with dropouts author paulu nancy medium</recid>
+</hit>
+<hit>
  <md-title>Computer science &amp; technology</md-title>
  <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
  <md-date>1977</md-date>
  <md-subject>Optical pattern recognition</md-subject>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="469587202">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="3220276566">
   <md-title>Computer science &amp; technology</md-title>
   <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
   <md-date>1977</md-date>
@@ -314,8 +354,8 @@
  <md-subject>Scintillation cameras</md-subject>
  <md-subject>Imaging systems in medicine</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1777675662">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="970776754">
   <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
   <md-title-remainder>the proceedings of a workshop</md-title-remainder>
   <md-date>1974</md-date>
@@ -333,8 +373,8 @@
  <md-subject>Bible. O.T</md-subject>
  <md-subject>Bible</md-subject>
  <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="2524395371">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="459409883">
   <md-title>The Computer Bible</md-title>
   <md-date>1973-1980</md-date>
   <md-subject>Bible. O.T</md-subject>
@@ -345,34 +385,4 @@
  <count>1</count>
  <recid>content: title the computer bible author medium book</recid>
 </hit>
-<hit>
- <md-title>Check this out</md-title>
- <md-title-remainder>library program models</md-title-remainder>
- <md-date>1987</md-date>
- <md-author>Seager, Andrew J</md-author>
- <md-subject>Libraries and community</md-subject>
- <md-subject>Libraries and education</md-subject>
- <md-subject>School libraries</md-subject>
- <md-subject>Instructional materials centers</md-subject>
- <md-subject>Public libraries</md-subject>
- <md-description>Distributed to depository libraries in microfiche</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="840289118">
-  <md-title>Check this out</md-title>
-  <md-title-remainder>library program models</md-title-remainder>
-  <md-date>1987</md-date>
-  <md-author>Seager, Andrew J</md-author>
-  <md-subject>Libraries and community</md-subject>
-  <md-subject>Libraries and education</md-subject>
-  <md-subject>School libraries</md-subject>
-  <md-subject>Instructional materials centers</md-subject>
-  <md-subject>Public libraries</md-subject>
-  <md-description tag="500">Distributed to depository libraries in microfiche</md-description>
-  <md-description tag="500">&quot;July 1987.&quot;</md-description>
-  <md-description tag="504">Includes bibliographical references</md-description>
-  <md-description tag="500">&quot;LP 87-403c.&quot;</md-description>
- </location>
- <count>1</count>
- <recid>content: title check this out author seager andrew j medium book</recid>
-</hit>
 </show>
\ No newline at end of file

diff --git a/test/test_filter_17.res b/test/test_filter_17.res
index c216196..20cc9d5 100644 (file)
--- a/test/test_filter_17.res
+++ b/test/test_filter_17.res
@@ -12,8 +12,8 @@
  <md-author>Englund, Carl R</md-author>
  <md-subject>Railroads</md-subject>
  <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1963026620">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="2197542824">
   <md-title>Washington metropolitan area rail computer feasibility study;</md-title>
   <md-title-remainder>final report</md-title-remainder>
   <md-date>1971</md-date>
@@ -29,8 +29,8 @@
  <md-date>1977</md-date>
  <md-author>Wood, Helen M</md-author>
  <md-subject>Computers</md-subject>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1216306911">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="2708909695">
   <md-title>The use of passwords for controlled access to computer resources</md-title>
   <md-date>1977</md-date>
   <md-author>Wood, Helen M</md-author>
@@ -46,8 +46,8 @@
  <md-subject>Educational technology</md-subject>
  <md-subject>Federal aid to education</md-subject>
  <md-description>&quot;This directory was developed by the Technology for the National Diffusion Network Project, Teachers College, Columbia University pursuant to contract number OE-300-83-0253, U.S. Department of Education&quot;--T.p. verso</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="93569409">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="1890208281">
   <md-title>Technology programs that work</md-title>
   <md-date>1984</md-date>
   <md-subject>United States</md-subject>
@@ -70,8 +70,8 @@
  <md-subject>Philosophy, Ancient</md-subject>
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="4203185747">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="663442211">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
@@ -90,8 +90,8 @@
  <md-date>1977</md-date>
  <md-subject>Tomography</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="4017834789">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="3731643437">
   <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine</md-title>
   <md-title-remainder>proceedings of the workshop</md-title-remainder>
   <md-date>1977</md-date>
@@ -109,8 +109,8 @@
  <md-subject>Cartography</md-subject>
  <md-subject>Puget Sound region (Wash.)</md-subject>
  <md-description>Scale of maps ca. 1:1,000,000</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="3271115080">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="4243010308">
   <md-title>The Puget Sound Region</md-title>
   <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
   <md-date>1974</md-date>
@@ -129,8 +129,8 @@
  <md-subject>Universities and colleges</md-subject>
  <md-subject>Community colleges</md-subject>
  <md-description>Cover title</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="2709746329">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="1686175953">
   <md-title>A plan for community college computer development</md-title>
   <md-date>1971</md-date>
   <md-subject>Universities and colleges</md-subject>
@@ -147,8 +147,8 @@
  <md-subject>Physical education</md-subject>
  <md-subject>Handicapped children</md-subject>
  <md-description>Distributed to depository libraries in microfiche</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="3080448245">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="4139708093">
   <md-title>National dissemination model for the I&apos;M SPECIAL Program of Physical Education for the Handicapped, 1983-1986</md-title>
   <md-title-remainder>final report, I&apos;M SPECIAL network</md-title-remainder>
   <md-date>1986</md-date>
@@ -170,8 +170,8 @@
  <md-subject>Leno, Jay</md-subject>
  <md-subject>Talk shows</md-subject>
  <md-description>Includes index</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="2895097287">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="2912942023">
   <md-title>The late shift</md-title>
   <md-title-remainder>Letterman, Leno, and the network battle for the night</md-title-remainder>
   <md-date>1993</md-date>
@@ -194,8 +194,8 @@
  <md-subject>Computer Systems</md-subject>
  <md-subject>Online Systems</md-subject>
  <md-description>Title from caption</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1401657869">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="3935675765">
   <md-title>Internet world</md-title>
   <md-date>1992</md-date>
   <md-subject>Internet (Computer network)</md-subject>
@@ -215,8 +215,8 @@
  <md-subject>Internet (Computer network)</md-subject>
  <md-subject>Mailing lists</md-subject>
  <md-description>Includes index</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="3641816996">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="2401575152">
   <md-title>Internet</md-title>
   <md-title-remainder>mailing lists</md-title-remainder>
   <md-date>1993</md-date>
@@ -231,8 +231,8 @@
  <md-title>Info Canada</md-title>
  <md-date>1991</md-date>
  <md-description>Includes: Network world Canada, Sept. 1991-Jan. 1992</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="2148377578">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="3424308894">
   <md-title>Info Canada</md-title>
   <md-date>1991</md-date>
   <md-description tag="500">Title from caption</md-description>
@@ -244,13 +244,13 @@
 <hit>
  <md-title>How to program a computer</md-title>
  <md-author>Jack Collins</md-author>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1030955953">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="1482143625">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
  </location>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="284236244">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="1993510496">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
  </location>
@@ -263,8 +263,8 @@
  <md-date>1980</md-date>
  <md-author>Smith, George Adam</md-author>
  <md-subject>Bible</md-subject>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="654938160">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="152075340">
   <md-title>Four psalms</md-title>
   <md-title-remainder>XXIII, XXXVI, LII, CXXI</md-title-remainder>
   <md-date>1980</md-date>
@@ -283,8 +283,8 @@
  <md-subject>Library information networks</md-subject>
  <md-subject>Libraries, Governmental, administrative, etc</md-subject>
  <md-description>Description based on: 1990</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1587008827">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="867474539">
   <md-title>FEDLINK services directory for fiscal year</md-title>
   <md-subject>FEDLINK (Network)</md-subject>
   <md-subject>Library information networks</md-subject>
@@ -300,8 +300,8 @@
  <md-author>Oberst, Bruce</md-author>
  <md-subject>Bible. O.T. Deuteronomy</md-subject>
  <md-description>Bibliography: p. 449-452</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="3456466038">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="1174809082">
   <md-title>Deuteronomy</md-title>
   <md-date>1968</md-date>
   <md-author>Oberst, Bruce</md-author>
@@ -318,8 +318,8 @@
  <md-author>Paulu, Nancy</md-author>
  <md-subject>Dropouts</md-subject>
  <md-description>Distributed to depository libraries in microfiche</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="2333728536">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="356107668">
   <md-title>Dealing with dropouts</md-title>
   <md-title-remainder>the urban superintendents&apos; call to action</md-title-remainder>
   <md-date>1987</md-date>
@@ -336,8 +336,8 @@
  <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
  <md-date>1977</md-date>
  <md-subject>Optical pattern recognition</md-subject>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="469587202">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="3220276566">
   <md-title>Computer science &amp; technology</md-title>
   <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
   <md-date>1977</md-date>
@@ -354,8 +354,8 @@
  <md-subject>Scintillation cameras</md-subject>
  <md-subject>Imaging systems in medicine</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1777675662">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="970776754">
   <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
   <md-title-remainder>the proceedings of a workshop</md-title-remainder>
   <md-date>1974</md-date>
@@ -373,8 +373,8 @@
  <md-subject>Bible. O.T</md-subject>
  <md-subject>Bible</md-subject>
  <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="2524395371">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="459409883">
   <md-title>The Computer Bible</md-title>
   <md-date>1973-1980</md-date>
   <md-subject>Bible. O.T</md-subject>

diff --git a/test/test_filter_3.res b/test/test_filter_3.res
index e693c44..c24b060 100644 (file)
--- a/test/test_filter_3.res
+++ b/test/test_filter_3.res
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <show><status>OK</status>
-<activeclients>1</activeclients>
+<activeclients>0</activeclients>
 <merged>12</merged>
 <total>12</total>
 <start>0</start>

diff --git a/test/test_filter_4.res b/test/test_filter_4.res
index fdb19a1..bdacc97 100644 (file)
--- a/test/test_filter_4.res
+++ b/test/test_filter_4.res
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<termlist><activeclients>1</activeclients>
+<termlist><activeclients>0</activeclients>
 <list name="author">
 <term><name>Adam, James</name><frequency>1</frequency></term>
 <term><name>Carter, Bill</name><frequency>1</frequency></term>

diff --git a/test/test_filter_6.res b/test/test_filter_6.res
index e63ac01..b274741 100644 (file)
--- a/test/test_filter_6.res
+++ b/test/test_filter_6.res
@@ -11,8 +11,8 @@
  <md-subject>Bible. O.T</md-subject>
  <md-subject>Bible</md-subject>
  <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="2524395371">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="459409883">
   <md-title>The Computer Bible</md-title>
   <md-date>1973-1980</md-date>
   <md-subject>Bible. O.T</md-subject>
@@ -32,8 +32,8 @@
  <md-subject>Cartography</md-subject>
  <md-subject>Puget Sound region (Wash.)</md-subject>
  <md-description>Scale of maps ca. 1:1,000,000</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="3271115080">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="4243010308">
   <md-title>The Puget Sound Region</md-title>
   <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
   <md-date>1974</md-date>
@@ -53,8 +53,8 @@
  <md-date>1977</md-date>
  <md-subject>Tomography</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="4017834789">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="3731643437">
   <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine</md-title>
   <md-title-remainder>proceedings of the workshop</md-title-remainder>
   <md-date>1977</md-date>
@@ -73,8 +73,8 @@
  <md-subject>Scintillation cameras</md-subject>
  <md-subject>Imaging systems in medicine</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1777675662">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="970776754">
   <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
   <md-title-remainder>the proceedings of a workshop</md-title-remainder>
   <md-date>1974</md-date>
@@ -92,8 +92,8 @@
  <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
  <md-date>1977</md-date>
  <md-subject>Optical pattern recognition</md-subject>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="469587202">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="3220276566">
   <md-title>Computer science &amp; technology</md-title>
   <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
   <md-date>1977</md-date>
@@ -106,13 +106,13 @@
 <hit>
  <md-title>How to program a computer</md-title>
  <md-author>Jack Collins</md-author>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1030955953">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="1482143625">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
  </location>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="284236244">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="1993510496">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
  </location>

diff --git a/test/test_filter_7.res b/test/test_filter_7.res
index ae1d3a0..59210ec 100644 (file)
--- a/test/test_filter_7.res
+++ b/test/test_filter_7.res
@@ -23,7 +23,7 @@
 </list>
 <list name="xtargets">
 <term>
-<id>localhost:9999/Slow</id>
+<id>localhost:9999</id>
 <name>ztest slow</name>
 <frequency>7</frequency>
 <state>Client_Idle</state>

diff --git a/test/test_filter_9.res b/test/test_filter_9.res
index e63ac01..b274741 100644 (file)
--- a/test/test_filter_9.res
+++ b/test/test_filter_9.res
@@ -11,8 +11,8 @@
  <md-subject>Bible. O.T</md-subject>
  <md-subject>Bible</md-subject>
  <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="2524395371">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="459409883">
   <md-title>The Computer Bible</md-title>
   <md-date>1973-1980</md-date>
   <md-subject>Bible. O.T</md-subject>
@@ -32,8 +32,8 @@
  <md-subject>Cartography</md-subject>
  <md-subject>Puget Sound region (Wash.)</md-subject>
  <md-description>Scale of maps ca. 1:1,000,000</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="3271115080">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="4243010308">
   <md-title>The Puget Sound Region</md-title>
   <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
   <md-date>1974</md-date>
@@ -53,8 +53,8 @@
  <md-date>1977</md-date>
  <md-subject>Tomography</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="4017834789">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="3731643437">
   <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine</md-title>
   <md-title-remainder>proceedings of the workshop</md-title-remainder>
   <md-date>1977</md-date>
@@ -73,8 +73,8 @@
  <md-subject>Scintillation cameras</md-subject>
  <md-subject>Imaging systems in medicine</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1777675662">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="970776754">
   <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
   <md-title-remainder>the proceedings of a workshop</md-title-remainder>
   <md-date>1974</md-date>
@@ -92,8 +92,8 @@
  <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
  <md-date>1977</md-date>
  <md-subject>Optical pattern recognition</md-subject>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="469587202">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="3220276566">
   <md-title>Computer science &amp; technology</md-title>
   <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
   <md-date>1977</md-date>
@@ -106,13 +106,13 @@
 <hit>
  <md-title>How to program a computer</md-title>
  <md-author>Jack Collins</md-author>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="1030955953">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="1482143625">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
  </location>
- <location id="localhost:9999/Slow"
-    name="ztest slow" checksum="284236244">
+ <location id="localhost:9999"
+    name="ztest slow" checksum="1993510496">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
  </location>

diff --git a/test/test_termlist_block.sh b/test/test_termlist_block.sh
index e7b1203..fb9e31b 100755 (executable)
--- a/test/test_termlist_block.sh
+++ b/test/test_termlist_block.sh
@@ -1,24 +1,45 @@
 #!/bin/sh
+#
 
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-#TODO set up solr target. For now use donut 
-#F=../solr/client.sh 
-#
-#rm -f solr.pid
-#$F -l solr.log -p ztest.pid -D @:9999
-#sleep 1
-#if test ! -f ztest.pid; then
-#    echo "yaz-ztest could not be started"
-#    exit 0
-#fi
+TEST=test_termlist_block
 
-${srcdir}/run_pazpar2.sh test_termlist_block
-E=$?
+# look for yaz-ztest in PATH
+oIFS=$IFS
+IFS=:
+F=''
+for p in $PATH; do
+    if test -x $p/yaz-ztest -a -x $p/yaz-client; then
+       VERSION=`$p/yaz-client -V|awk '{print $3;}'|awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+        if test $VERSION -ge 4000000; then
+            F=$p/yaz-ztest
+            break
+        fi
+    fi
+done
+IFS=$oIFS
 
-#kill `cat ztest.pid`
-#rm ztest.pid
+if test -z "$F"; then
+    echo "yaz-ztest not found"
+    exit 0
+fi
+
+rm -f ztest.pid
+rm -f ${TEST}_ztest.log
+$F -l ${TEST}_ztest.log -p ztest.pid -D tcp:localhost:9999
+sleep 1
+if test ! -f ztest.pid; then
+    echo "yaz-ztest could not be started"
+    exit 0
+fi
+
+# Test using test_http.cfg
+${srcdir}/run_pazpar2.sh ${TEST}
+E=$?
+kill `cat ztest.pid`
+rm ztest.pid
 exit $E
 
 # Local Variables:

diff --git a/test/test_termlist_block_10.res b/test/test_termlist_block_10.res
index ba3ef40..5cb76eb 100644 (file)
--- a/test/test_termlist_block_10.res
+++ b/test/test_termlist_block_10.res
@@ -2,11 +2,10 @@
 <bytarget><status>OK</status>
 <target><id>localhost:9999/db1</id>
 <name>db1</name>
-<hits>0</hits>
-<diagnostic>10000</diagnostic>
-<addinfo>localhost:9999/db1</addinfo>
-<records>0</records>
-<state>Client_Error</state>
+<hits>22</hits>
+<diagnostic>0</diagnostic>
+<records>22</records>
+<state>Client_Idle</state>
 </target>
 <target><id>id_solr</id>
 <name>LOC (SOLR)</name>

diff --git a/test/test_termlist_block_11.res b/test/test_termlist_block_11.res
index 2495a3a..a651123 100644 (file)
--- a/test/test_termlist_block_11.res
+++ b/test/test_termlist_block_11.res
@@ -8,12 +8,21 @@
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
 </term>
+<term>
+<id>localhost:9999/db1</id>
+<name>db1</name>
+<frequency>22</frequency>
+<state>Client_Idle</state>
+<diagnostic>0</diagnostic>
+</term>
 </list>
 <list name="author">
 <term><name>Davis, Phyllis</name><frequency>2</frequency></term>
+<term><name>Jack Collins</name><frequency>2</frequency></term>
 <term><name>Norton, Peter</name><frequency>2</frequency></term>
 <term><name>Watt, Alan H</name><frequency>2</frequency></term>
 <term><name>Abass, Olayide</name><frequency>1</frequency></term>
+<term><name>Adam, James</name><frequency>1</frequency></term>
 <term><name>Aldrich, Richard W</name><frequency>1</frequency></term>
 <term><name>Appleman, Daniel</name><frequency>1</frequency></term>
 <term><name>Bainbridge, David I</name><frequency>1</frequency></term>
@@ -23,14 +32,12 @@
 <term><name>Bott, Ed</name><frequency>1</frequency></term>
 <term><name>Brogden, William B</name><frequency>1</frequency></term>
 <term><name>Caplin, Steve</name><frequency>1</frequency></term>
-<term><name>Carasik, Anne H</name><frequency>1</frequency></term>
-<term><name>Casey, Jean Marie</name><frequency>1</frequency></term>
 </list>
 <list name="subject">
 <term><name>Computer file</name><frequency>24</frequency></term>
-<term><name>Computers</name><frequency>20</frequency></term>
+<term><name>Computers</name><frequency>21</frequency></term>
+<term><name>Computer networks</name><frequency>14</frequency></term>
 <term><name>Computer graphics</name><frequency>13</frequency></term>
-<term><name>Computer networks</name><frequency>13</frequency></term>
 <term><name>Computer program language</name><frequency>10</frequency></term>
 <term><name>Computer science</name><frequency>10</frequency></term>
 <term><name>Computer security</name><frequency>9</frequency></term>
@@ -39,20 +46,25 @@
 <term><name>Computer programs</name><frequency>6</frequency></term>
 <term><name>Computer software</name><frequency>6</frequency></term>
 <term><name>Operating systems</name><frequency>6</frequency></term>
+<term><name>Bible</name><frequency>5</frequency></term>
 <term><name>Computer</name><frequency>5</frequency></term>
 <term><name>Computer crimes</name><frequency>5</frequency></term>
-<term><name>Computer architecture</name><frequency>4</frequency></term>
 </list>
 <list name="date">
 <term><name>2000</name><frequency>47</frequency></term>
 <term><name>2001</name><frequency>20</frequency></term>
 <term><name>1999</name><frequency>16</frequency></term>
 <term><name>1998</name><frequency>10</frequency></term>
+<term><name>1977</name><frequency>3</frequency></term>
+<term><name>1971</name><frequency>2</frequency></term>
+<term><name>1974</name><frequency>2</frequency></term>
+<term><name>1980</name><frequency>2</frequency></term>
+<term><name>1987</name><frequency>2</frequency></term>
+<term><name>1992</name><frequency>2</frequency></term>
+<term><name>1993</name><frequency>2</frequency></term>
 <term><name>1997</name><frequency>2</frequency></term>
-<term><name>1992</name><frequency>1</frequency></term>
-<term><name>1994</name><frequency>1</frequency></term>
-<term><name>1995</name><frequency>1</frequency></term>
-<term><name>1996</name><frequency>1</frequency></term>
-<term><name>2002</name><frequency>1</frequency></term>
+<term><name>1968</name><frequency>1</frequency></term>
+<term><name>1972</name><frequency>1</frequency></term>
+<term><name>1973</name><frequency>1</frequency></term>
 </list>
 </termlist>
\ No newline at end of file

diff --git a/test/test_termlist_block_12.res b/test/test_termlist_block_12.res
index 8cf83dc..c05f58f 100644 (file)
--- a/test/test_termlist_block_12.res
+++ b/test/test_termlist_block_12.res
@@ -9,12 +9,21 @@
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
 </term>
+<term>
+<id>localhost:9999/db1</id>
+<name>db1</name>
+<frequency>22</frequency>
+<state>Client_Idle</state>
+<diagnostic>0</diagnostic>
+</term>
 </list>
 <list name="author">
 <term><name>Davis, Phyllis</name><frequency>2</frequency></term>
+<term><name>Jack Collins</name><frequency>2</frequency></term>
 <term><name>Norton, Peter</name><frequency>2</frequency></term>
 <term><name>Watt, Alan H</name><frequency>2</frequency></term>
 <term><name>Abass, Olayide</name><frequency>1</frequency></term>
+<term><name>Adam, James</name><frequency>1</frequency></term>
 <term><name>Aldrich, Richard W</name><frequency>1</frequency></term>
 <term><name>Appleman, Daniel</name><frequency>1</frequency></term>
 <term><name>Bainbridge, David I</name><frequency>1</frequency></term>
@@ -24,14 +33,12 @@
 <term><name>Bott, Ed</name><frequency>1</frequency></term>
 <term><name>Brogden, William B</name><frequency>1</frequency></term>
 <term><name>Caplin, Steve</name><frequency>1</frequency></term>
-<term><name>Carasik, Anne H</name><frequency>1</frequency></term>
-<term><name>Casey, Jean Marie</name><frequency>1</frequency></term>
 </list>
 <list name="subject">
 <term><name>Computer file</name><frequency>24</frequency></term>
-<term><name>Computers</name><frequency>20</frequency></term>
+<term><name>Computers</name><frequency>21</frequency></term>
+<term><name>Computer networks</name><frequency>14</frequency></term>
 <term><name>Computer graphics</name><frequency>13</frequency></term>
-<term><name>Computer networks</name><frequency>13</frequency></term>
 <term><name>Computer program language</name><frequency>10</frequency></term>
 <term><name>Computer science</name><frequency>10</frequency></term>
 <term><name>Computer security</name><frequency>9</frequency></term>
@@ -40,20 +47,25 @@
 <term><name>Computer programs</name><frequency>6</frequency></term>
 <term><name>Computer software</name><frequency>6</frequency></term>
 <term><name>Operating systems</name><frequency>6</frequency></term>
+<term><name>Bible</name><frequency>5</frequency></term>
 <term><name>Computer</name><frequency>5</frequency></term>
 <term><name>Computer crimes</name><frequency>5</frequency></term>
-<term><name>Computer architecture</name><frequency>4</frequency></term>
 </list>
 <list name="date">
 <term><name>2000</name><frequency>47</frequency></term>
 <term><name>2001</name><frequency>20</frequency></term>
 <term><name>1999</name><frequency>16</frequency></term>
 <term><name>1998</name><frequency>10</frequency></term>
+<term><name>1977</name><frequency>3</frequency></term>
+<term><name>1971</name><frequency>2</frequency></term>
+<term><name>1974</name><frequency>2</frequency></term>
+<term><name>1980</name><frequency>2</frequency></term>
+<term><name>1987</name><frequency>2</frequency></term>
+<term><name>1992</name><frequency>2</frequency></term>
+<term><name>1993</name><frequency>2</frequency></term>
 <term><name>1997</name><frequency>2</frequency></term>
-<term><name>1992</name><frequency>1</frequency></term>
-<term><name>1994</name><frequency>1</frequency></term>
-<term><name>1995</name><frequency>1</frequency></term>
-<term><name>1996</name><frequency>1</frequency></term>
-<term><name>2002</name><frequency>1</frequency></term>
+<term><name>1968</name><frequency>1</frequency></term>
+<term><name>1972</name><frequency>1</frequency></term>
+<term><name>1973</name><frequency>1</frequency></term>
 </list>
 </termlist>
\ No newline at end of file

diff --git a/test/test_termlist_block_13.res b/test/test_termlist_block_13.res
index ba3ef40..5cb76eb 100644 (file)
--- a/test/test_termlist_block_13.res
+++ b/test/test_termlist_block_13.res
@@ -2,11 +2,10 @@
 <bytarget><status>OK</status>
 <target><id>localhost:9999/db1</id>
 <name>db1</name>
-<hits>0</hits>
-<diagnostic>10000</diagnostic>
-<addinfo>localhost:9999/db1</addinfo>
-<records>0</records>
-<state>Client_Error</state>
+<hits>22</hits>
+<diagnostic>0</diagnostic>
+<records>22</records>
+<state>Client_Idle</state>
 </target>
 <target><id>id_solr</id>
 <name>LOC (SOLR)</name>

diff --git a/test/test_termlist_block_4.res b/test/test_termlist_block_4.res
index 5a1147b..b1c2baa 100644 (file)
--- a/test/test_termlist_block_4.res
+++ b/test/test_termlist_block_4.res
@@ -1,8 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <show><status>OK</status>
 <activeclients>0</activeclients>
-<merged>0</merged>
-<total>0</total>
+<merged>6</merged>
+<total>7</total>
 <start>0</start>
-<num>0</num>
+<num>6</num>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack Collins</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="4195168235">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack Collins</md-author>
+ </location>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="75373906">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack Collins</md-author>
+ </location>
+ <count>2</count>
+ <relevance>69043</relevance>
+ <recid>content: title how to program a computer author jack collins</recid>
+</hit>
+<hit>
+ <md-title>Computer science &amp; technology</md-title>
+ <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
+ <md-date>1977</md-date>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="3319303400">
+  <md-title>Computer science &amp; technology</md-title>
+  <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
+  <md-date>1977</md-date>
+ </location>
+ <count>1</count>
+ <relevance>57536</relevance>
+ <recid>content: title computer science technology</recid>
+</hit>
+<hit>
+ <md-title>The Computer Bible</md-title>
+ <md-date>1973-1980</md-date>
+ <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="3844822301">
+  <md-title>The Computer Bible</md-title>
+  <md-date>1973-1980</md-date>
+  <md-description>Hebrew and Greek; introductions in English</md-description>
+  <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
+ </location>
+ <count>1</count>
+ <relevance>57536</relevance>
+ <recid>content: title the computer bible</recid>
+</hit>
+<hit>
+ <md-title>The Puget Sound Region</md-title>
+ <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
+ <md-date>1974</md-date>
+ <md-author>Mairs, John W</md-author>
+ <md-description>Scale of maps ca. 1:1,000,000</md-description>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="3669649334">
+  <md-title>The Puget Sound Region</md-title>
+  <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
+  <md-date>1974</md-date>
+  <md-author>Mairs, John W</md-author>
+  <md-description>Scale of maps ca. 1:1,000,000</md-description>
+ </location>
+ <count>1</count>
+ <relevance>23973</relevance>
+ <recid>content: title the puget sound region author mairs john w</recid>
+</hit>
+<hit>
+ <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
+ <md-title-remainder>the proceedings of a workshop</md-title-remainder>
+ <md-date>1974</md-date>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="4019995268">
+  <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
+  <md-title-remainder>the proceedings of a workshop</md-title-remainder>
+  <md-date>1974</md-date>
+ </location>
+ <count>1</count>
+ <relevance>17260</relevance>
+ <recid>content: title computer processing of dynamic images from an anger scintillation camera</recid>
+</hit>
+<hit>
+ <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine</md-title>
+ <md-title-remainder>proceedings of the workshop</md-title-remainder>
+ <md-date>1977</md-date>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="3494476367">
+  <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine</md-title>
+  <md-title-remainder>proceedings of the workshop</md-title-remainder>
+  <md-date>1977</md-date>
+ </location>
+ <count>1</count>
+ <relevance>0</relevance>
+ <recid>content: title reconstruction tomography in diagnostic radiology and nuclear medicine</recid>
+</hit>
 </show>
\ No newline at end of file

diff --git a/test/test_termlist_block_5.res b/test/test_termlist_block_5.res
index 0595f75..8b8a807 100644 (file)
--- a/test/test_termlist_block_5.res
+++ b/test/test_termlist_block_5.res
@@ -2,9 +2,8 @@
 <bytarget><status>OK</status>
 <target><id>localhost:9999/db1</id>
 <name>db1</name>
-<hits>0</hits>
-<diagnostic>10000</diagnostic>
-<addinfo>localhost:9999/db1</addinfo>
-<records>0</records>
-<state>Client_Error</state>
+<hits>7</hits>
+<diagnostic>0</diagnostic>
+<records>7</records>
+<state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file

diff --git a/test/test_termlist_block_6.res b/test/test_termlist_block_6.res
index cda4aea..f78c7dc 100644 (file)
--- a/test/test_termlist_block_6.res
+++ b/test/test_termlist_block_6.res
@@ -1,8 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <termlist><activeclients>0</activeclients>
 <list name="xtargets">
+<term>
+<id>localhost:9999/db1</id>
+<name>db1</name>
+<frequency>7</frequency>
+<state>Client_Idle</state>
+<diagnostic>0</diagnostic>
+</term>
+</list>
+<list name="author">
+<term><name>Jack Collins</name><frequency>2</frequency></term>
+<term><name>Mairs, John W</name><frequency>1</frequency></term>
+</list>
+<list name="subject">
+<term><name>Bible</name><frequency>1</frequency></term>
+<term><name>Bible. O.T</name><frequency>1</frequency></term>
+<term><name>Cartography</name><frequency>1</frequency></term>
+<term><name>Imaging systems in medicine</name><frequency>1</frequency></term>
+<term><name>Optical pattern recognition</name><frequency>1</frequency></term>
+<term><name>Puget Sound region (Wash.)</name><frequency>1</frequency></term>
+<term><name>Radioisotope scanning</name><frequency>1</frequency></term>
+<term><name>Scintillation cameras</name><frequency>1</frequency></term>
+<term><name>Tomography</name><frequency>1</frequency></term>
+</list>
+<list name="date">
+<term><name>1974</name><frequency>2</frequency></term>
+<term><name>1977</name><frequency>2</frequency></term>
+<term><name>1973</name><frequency>1</frequency></term>
+<term><name>1980</name><frequency>1</frequency></term>
 </list>
-<list name="author"/>
-<list name="subject"/>
-<list name="date"/>
 </termlist>
\ No newline at end of file

diff --git a/test/test_termlist_block_9.res b/test/test_termlist_block_9.res
index 56b0b3a..20fa7b7 100644 (file)
--- a/test/test_termlist_block_9.res
+++ b/test/test_termlist_block_9.res
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <show><status>OK</status>
 <activeclients>0</activeclients>
-<merged>100</merged>
-<total>2015</total>
+<merged>121</merged>
+<total>2037</total>
 <start>0</start>
 <num>20</num>
 <hit>
@@ -18,7 +18,7 @@
   <md-author>Woodward, C. Michael</md-author>
  </location>
  <count>1</count>
- <relevance>49512</relevance>
+ <relevance>100676</relevance>
  <recid>content: title adobe illustrator for the mac author woodward c michael</recid>
 </hit>
 <hit>
@@ -30,7 +30,7 @@
   <md-date>1998</md-date>
  </location>
  <count>1</count>
- <relevance>49512</relevance>
+ <relevance>100676</relevance>
  <recid>content: title advanced computer performance modeling and simulation</recid>
 </hit>
 <hit>
@@ -48,7 +48,7 @@
   <md-description>&quot;April 2000.&quot;</md-description>
  </location>
  <count>1</count>
- <relevance>49512</relevance>
+ <relevance>100676</relevance>
  <recid>content: title cyberterrorism and computer crimes author aldrich richard w</recid>
 </hit>
 <hit>
@@ -64,7 +64,7 @@
   <md-author>Kaasgaard, Klaus</md-author>
  </location>
  <count>1</count>
- <relevance>45386</relevance>
+ <relevance>92286</relevance>
  <recid>content: title software design and usability author kaasgaard klaus</recid>
 </hit>
 <hit>
@@ -80,7 +80,7 @@
   <md-description>Explains what computer hacking is, who does it, and how dangerous it can be</md-description>
  </location>
  <count>1</count>
- <relevance>43403</relevance>
+ <relevance>88255</relevance>
  <recid>content: title everything you need to know about the dangers of computer hacking author knittel john</recid>
 </hit>
 <hit>
@@ -94,7 +94,7 @@
   <md-author>Cook, Barry M</md-author>
  </location>
  <count>1</count>
- <relevance>43323</relevance>
+ <relevance>88091</relevance>
  <recid>content: title computer peripherals author cook barry m</recid>
 </hit>
 <hit>
@@ -109,7 +109,7 @@
   <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>
  <count>1</count>
- <relevance>38051</relevance>
+ <relevance>77371</relevance>
  <recid>content: title kids computer book</recid>
 </hit>
 <hit>
@@ -123,7 +123,7 @@
   <md-author>Steinbacher, Raymond</md-author>
  </location>
  <count>1</count>
- <relevance>37134</relevance>
+ <relevance>75507</relevance>
  <recid>content: title computer friendly author steinbacher raymond</recid>
 </hit>
 <hit>
@@ -139,7 +139,7 @@
   <md-description>&quot;Also published as Parliamentary Paper E 31AO&quot;--T.p. verso</md-description>
  </location>
  <count>1</count>
- <relevance>37134</relevance>
+ <relevance>75507</relevance>
  <recid>content: title computer misuse</recid>
 </hit>
 <hit>
@@ -155,7 +155,7 @@
   <md-author>Ross, Keith W</md-author>
  </location>
  <count>1</count>
- <relevance>37134</relevance>
+ <relevance>75507</relevance>
  <recid>content: title computer networking author ross keith w</recid>
 </hit>
 <hit>
@@ -171,7 +171,7 @@
   <md-description>Includes index</md-description>
  </location>
  <count>1</count>
- <relevance>37134</relevance>
+ <relevance>75507</relevance>
  <recid>content: title coreldraw for windows author davis phyllis</recid>
 </hit>
 <hit>
@@ -190,7 +190,7 @@
   <md-description>&quot;Covers Quicken deluxe 2000 for the Mac&quot;--Cover</md-description>
  </location>
  <count>1</count>
- <relevance>37134</relevance>
+ <relevance>75507</relevance>
  <recid>content: title quicken for the mac author langer maria</recid>
 </hit>
 <hit>
@@ -202,7 +202,7 @@
   <md-date>1998</md-date>
  </location>
  <count>1</count>
- <relevance>37134</relevance>
+ <relevance>75507</relevance>
  <recid>content: title sicherheit und schutz im netz</recid>
 </hit>
 <hit>
@@ -218,7 +218,7 @@
   <md-description>Includes index</md-description>
  </location>
  <count>1</count>
- <relevance>37134</relevance>
+ <relevance>75507</relevance>
  <recid>content: title unix secure shell author carasik anne h</recid>
 </hit>
 <hit>
@@ -234,7 +234,7 @@
   <md-description>&quot;IEEE catalog number 99EX370&quot;--T.p. verso</md-description>
  </location>
  <count>1</count>
- <relevance>35071</relevance>
+ <relevance>71312</relevance>
  <recid>content: title eight international conference on computer communications and networks</recid>
 </hit>
 <hit>
@@ -250,7 +250,7 @@
   <md-description>Includes index</md-description>
  </location>
  <count>1</count>
- <relevance>33008</relevance>
+ <relevance>67117</relevance>
  <recid>content: title building storage networks author farley marc</recid>
 </hit>
 <hit>
@@ -268,7 +268,7 @@
   <md-description>Includes index</md-description>
  </location>
  <count>1</count>
- <relevance>33008</relevance>
+ <relevance>67117</relevance>
  <recid>content: title complete cl author malaga ernie</recid>
 </hit>
 <hit>
@@ -284,10 +284,24 @@
   <md-author>Watt, Alan H</md-author>
  </location>
  <count>1</count>
- <relevance>33008</relevance>
+ <relevance>67117</relevance>
  <recid>content: title d games author watt alan h</recid>
 </hit>
 <hit>
+ <md-title>Internet world</md-title>
+ <md-date>1992</md-date>
+ <md-description>Title from caption</md-description>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="2093092631">
+  <md-title>Internet world</md-title>
+  <md-date>1992</md-date>
+  <md-description>Title from caption</md-description>
+ </location>
+ <count>1</count>
+ <relevance>67117</relevance>
+ <recid>content: title internet world</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>
@@ -298,24 +312,7 @@
   <md-author>Denoncourt, Don</md-author>
  </location>
  <count>1</count>
- <relevance>33008</relevance>
+ <relevance>67117</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>
- <md-description>&quot;Useful techniques from sorting to encryption&quot;--Cover</md-description>
- <location id="id_solr"
-    name="LOC (SOLR)" checksum="121695994">
-  <md-title>Mastering algorithms with C</md-title>
-  <md-date>1999</md-date>
-  <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>
- <count>1</count>
- <relevance>33008</relevance>
- <recid>content: title mastering algorithms with c author loudon kyle</recid>
-</hit>
 </show>
\ No newline at end of file