Avoid random hit-count for facets test

This is to ensure we get same results everywhere. Trick
is to add a term in PQF that includes a number (digits) -
this will make yaz-ztest return that hit count.

diff --git a/test/test_facets_10.res b/test/test_facets_10.res
index c206035..678049e 100644 (file)
--- a/test/test_facets_10.res
+++ b/test/test_facets_10.res
@@ -2,15 +2,15 @@
 <bytarget><status>OK</status>
 <target><id>localhost:9999/db1</id>
 <name>db1</name>
-<hits>1</hits>
+<hits>4</hits>
 <diagnostic>0</diagnostic>
-<records>1</records>
+<records>4</records>
 <state>Client_Idle</state>
 </target>
 <target><id>localhost:9999/db2</id>
 <name>db2</name>
-<hits>7</hits>
+<hits>4</hits>
 <diagnostic>0</diagnostic>
-<records>7</records>
+<records>4</records>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file

diff --git a/test/test_facets_11.res b/test/test_facets_11.res
index d27e17b..adef51f 100644 (file)
--- a/test/test_facets_11.res
+++ b/test/test_facets_11.res
@@ -2,16 +2,16 @@
 <activeclients>0</activeclients>
 <list name="xtargets">
 <term>
-<id>localhost:9999/db2</id>
-<name>db2</name>
-<frequency>7</frequency>
+<id>localhost:9999/db1</id>
+<name>db1</name>
+<frequency>4</frequency>
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
 </term>
 <term>
-<id>localhost:9999/db1</id>
-<name>db1</name>
-<frequency>1</frequency>
+<id>localhost:9999/db2</id>
+<name>db2</name>
+<frequency>4</frequency>
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
 </term>
@@ -22,7 +22,7 @@
 <term><name>author2</name><frequency>80</frequency></term>
 <term><name>author3</name><frequency>70</frequency></term>
 <term><name>author4</name><frequency>60</frequency></term>
-<term><name>Jack Collins</name><frequency>1</frequency></term>
+<term><name>Jack Collins</name><frequency>2</frequency></term>
 </list>
 <list name="subject">
 <term><name>subject0</name><frequency>100</frequency></term>
@@ -30,6 +30,11 @@
 <term><name>subject2</name><frequency>80</frequency></term>
 <term><name>subject3</name><frequency>70</frequency></term>
 <term><name>subject4</name><frequency>60</frequency></term>
+<term><name>Radioisotope scanning</name><frequency>1</frequency></term>
+<term><name>Scintillation cameras</name><frequency>1</frequency></term>
+<term><name>Imaging systems in medicine</name><frequency>1</frequency></term>
+<term><name>Bible. O.T</name><frequency>1</frequency></term>
+<term><name>Bible</name><frequency>1</frequency></term>
 </list>
 <list name="date">
 <term><name>date0</name><frequency>100</frequency></term>
@@ -37,5 +42,8 @@
 <term><name>date2</name><frequency>80</frequency></term>
 <term><name>date3</name><frequency>70</frequency></term>
 <term><name>date4</name><frequency>60</frequency></term>
+<term><name>1974</name><frequency>1</frequency></term>
+<term><name>1980</name><frequency>1</frequency></term>
+<term><name>1973</name><frequency>1</frequency></term>
 </list>
 </termlist>

diff --git a/test/test_facets_13.res b/test/test_facets_13.res
index f72d13f..a549e49 100644 (file)
--- a/test/test_facets_13.res
+++ b/test/test_facets_13.res
@@ -2,21 +2,10 @@
 <show>
 <status>OK</status>
 <activeclients>0</activeclients>
-<merged>16</merged>
-<total>18</total>
+<merged>7</merged>
+<total>16</total>
 <start>0</start>
-<num>16</num>
-<hit>
-
-<md-title>Internet world</md-title>
-<md-date>1992</md-date>
-<md-description>Title from caption</md-description><location id="localhost:9999/db2" name="db2">
-<md-title>Internet world</md-title>
-<md-date>1992</md-date>
-<md-description>Title from caption</md-description></location>
-<relevance>162186</relevance>
-<recid>title internet world</recid>
-</hit>
+<num>7</num>
 <hit>
 
 <md-title>How to program a computer</md-title>
@@ -29,8 +18,11 @@
 <location id="localhost:9999/db1" name="db1">
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author></location>
-<count>3</count>
-<relevance>145967</relevance>
+<location id="localhost:9999/db1" name="db1">
+<md-title>How to program a computer</md-title>
+<md-author>Jack Collins</md-author></location>
+<count>4</count>
+<relevance>64095</relevance>
 <recid>title how to program a computer author jack collins</recid>
 </hit>
 <hit>
@@ -41,7 +33,12 @@
 <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>
-<relevance>81093</relevance>
+<location id="localhost:9999/db1" name="db1">
+<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>2</count>
+<relevance>53412</relevance>
 <recid>title computer science technology</recid>
 </hit>
 <hit>
@@ -53,50 +50,17 @@
 <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>
-<relevance>81093</relevance>
+<location id="localhost:9999/db1" name="db1">
+<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>2</count>
+<relevance>53412</relevance>
 <recid>title the computer bible</recid>
 </hit>
 <hit>
 
-<md-title>Internet</md-title>
-<md-title-remainder>mailing lists</md-title-remainder>
-<md-date>1993</md-date>
-<md-description>Includes index</md-description><location id="localhost:9999/db2" name="db2">
-<md-title>Internet</md-title>
-<md-title-remainder>mailing lists</md-title-remainder>
-<md-date>1993</md-date>
-<md-description>Includes index</md-description></location>
-<relevance>40546</relevance>
-<recid>title internet</recid>
-</hit>
-<hit>
-
-<md-title>A plan for community college computer development</md-title>
-<md-date>1971</md-date>
-<md-description>Cover title</md-description><location id="localhost:9999/db2" name="db2">
-<md-title>A plan for community college computer development</md-title>
-<md-date>1971</md-date>
-<md-description>Cover title</md-description></location>
-<relevance>34754</relevance>
-<recid>title a plan for community college computer development</recid>
-</hit>
-<hit>
-
-<md-title>Washington metropolitan area rail computer feasibility study;</md-title>
-<md-title-remainder>final report</md-title-remainder>
-<md-date>1971</md-date>
-<md-author>Englund, Carl R</md-author>
-<md-description>&quot;Contract DOT-UT-10003.&quot;</md-description><location id="localhost:9999/db2" name="db2">
-<md-title>Washington metropolitan area rail computer feasibility study;</md-title>
-<md-title-remainder>final report</md-title-remainder>
-<md-date>1971</md-date>
-<md-author>Englund, Carl R</md-author>
-<md-description>&quot;Contract DOT-UT-10003.&quot;</md-description></location>
-<relevance>34754</relevance>
-<recid>title washington metropolitan area rail computer feasibility study author englund carl r</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>
@@ -107,7 +71,14 @@
 <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>
-<relevance>33788</relevance>
+<location id="localhost:9999/db1" name="db1">
+<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>2</count>
+<relevance>22255</relevance>
 <recid>title the puget sound region author mairs john w</recid>
 </hit>
 <hit>
@@ -118,7 +89,12 @@
 <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>
-<relevance>24327</relevance>
+<location id="localhost:9999/db1" name="db1">
+<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>2</count>
+<relevance>16023</relevance>
 <recid>title computer processing of dynamic images from an anger scintillation camera</recid>
 </hit>
 <hit>
@@ -129,81 +105,28 @@
 <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></location>
-<relevance>24327</relevance>
+<location id="localhost:9999/db1" name="db1">
+<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></location>
+<count>2</count>
+<relevance>16023</relevance>
 <recid>title the use of passwords for controlled access to computer resources author wood helen m</recid>
 </hit>
 <hit>
 
-<md-title>Deuteronomy</md-title>
-<md-date>1968</md-date>
-<md-author>Oberst, Bruce</md-author><location id="localhost:9999/db2" name="db2">
-<md-title>Deuteronomy</md-title>
-<md-date>1968</md-date>
-<md-author>Oberst, Bruce</md-author></location>
-<relevance>0</relevance>
-<recid>title deuteronomy author oberst bruce</recid>
-</hit>
-<hit>
-
-<md-title>Four psalms</md-title>
-<md-title-remainder>XXIII, XXXVI, LII, CXXI</md-title-remainder>
-<md-date>1980</md-date>
-<md-author>Smith, George Adam</md-author><location id="localhost:9999/db2" name="db2">
-<md-title>Four psalms</md-title>
-<md-title-remainder>XXIII, XXXVI, LII, CXXI</md-title-remainder>
-<md-date>1980</md-date>
-<md-author>Smith, George Adam</md-author></location>
-<relevance>0</relevance>
-<recid>title four psalms author smith george adam</recid>
-</hit>
-<hit>
-
-<md-title>Info Canada</md-title>
-<md-date>1991</md-date>
-<md-description>Title from caption</md-description><location id="localhost:9999/db2" name="db2">
-<md-title>Info Canada</md-title>
-<md-date>1991</md-date>
-<md-description>Title from caption</md-description></location>
-<relevance>0</relevance>
-<recid>title info canada</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/db2" name="db2">
 <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>
+<location id="localhost:9999/db1" name="db1">
+<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>2</count>
 <relevance>0</relevance>
 <recid>title reconstruction tomography in diagnostic radiology and nuclear medicine</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>
-<md-author>Carter, Bill</md-author>
-<md-description>Includes index</md-description><location id="localhost:9999/db2" name="db2">
-<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>
-<md-author>Carter, Bill</md-author>
-<md-description>Includes index</md-description></location>
-<relevance>0</relevance>
-<recid>title the late shift author carter bill</recid>
-</hit>
-<hit>
-
-<md-title>The religious teachers of Greece</md-title>
-<md-date>1972</md-date>
-<md-author>Adam, James</md-author>
-<md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description><location id="localhost:9999/db2" name="db2">
-<md-title>The religious teachers of Greece</md-title>
-<md-date>1972</md-date>
-<md-author>Adam, James</md-author>
-<md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description></location>
-<relevance>0</relevance>
-<recid>title the religious teachers of greece author adam james</recid>
-</hit>
 </show>

diff --git a/test/test_facets_14.res b/test/test_facets_14.res
index 5a567b8..a52b627 100644 (file)
--- a/test/test_facets_14.res
+++ b/test/test_facets_14.res
@@ -2,16 +2,16 @@
 <activeclients>0</activeclients>
 <list name="xtargets">
 <term>
-<id>localhost:9999/db2</id>
-<name>db2</name>
-<frequency>17</frequency>
+<id>localhost:9999/db1</id>
+<name>db1</name>
+<frequency>8</frequency>
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
 </term>
 <term>
-<id>localhost:9999/db1</id>
-<name>db1</name>
-<frequency>1</frequency>
+<id>localhost:9999/db2</id>
+<name>db2</name>
+<frequency>8</frequency>
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
 </term>
@@ -22,7 +22,9 @@
 <term><name>author2</name><frequency>80</frequency></term>
 <term><name>author3</name><frequency>70</frequency></term>
 <term><name>author4</name><frequency>60</frequency></term>
-<term><name>Jack Collins</name><frequency>1</frequency></term>
+<term><name>Jack Collins</name><frequency>2</frequency></term>
+<term><name>Mairs, John W</name><frequency>1</frequency></term>
+<term><name>Wood, Helen M</name><frequency>1</frequency></term>
 </list>
 <list name="subject">
 <term><name>subject0</name><frequency>100</frequency></term>
@@ -30,6 +32,16 @@
 <term><name>subject2</name><frequency>80</frequency></term>
 <term><name>subject3</name><frequency>70</frequency></term>
 <term><name>subject4</name><frequency>60</frequency></term>
+<term><name>Radioisotope scanning</name><frequency>1</frequency></term>
+<term><name>Scintillation cameras</name><frequency>1</frequency></term>
+<term><name>Imaging systems in medicine</name><frequency>1</frequency></term>
+<term><name>Bible. O.T</name><frequency>1</frequency></term>
+<term><name>Bible</name><frequency>1</frequency></term>
+<term><name>Cartography</name><frequency>1</frequency></term>
+<term><name>Puget Sound region (Wash.)</name><frequency>1</frequency></term>
+<term><name>Tomography</name><frequency>1</frequency></term>
+<term><name>Optical pattern recognition</name><frequency>1</frequency></term>
+<term><name>Computers</name><frequency>1</frequency></term>
 </list>
 <list name="date">
 <term><name>date0</name><frequency>100</frequency></term>
@@ -37,5 +49,9 @@
 <term><name>date2</name><frequency>80</frequency></term>
 <term><name>date3</name><frequency>70</frequency></term>
 <term><name>date4</name><frequency>60</frequency></term>
+<term><name>1977</name><frequency>3</frequency></term>
+<term><name>1974</name><frequency>2</frequency></term>
+<term><name>1980</name><frequency>1</frequency></term>
+<term><name>1973</name><frequency>1</frequency></term>
 </list>
 </termlist>

diff --git a/test/test_facets_16.res b/test/test_facets_16.res
index 1d26a39..babcdbe 100644 (file)
--- a/test/test_facets_16.res
+++ b/test/test_facets_16.res
@@ -2,10 +2,10 @@
 <show>
 <status>OK</status>
 <activeclients>0</activeclients>
-<merged>16</merged>
-<total>19</total>
+<merged>5</merged>
+<total>12</total>
 <start>0</start>
-<num>16</num>
+<num>5</num>
 <hit>
 
 <md-title>How to program a computer</md-title>
@@ -22,191 +22,79 @@
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author></location>
 <count>4</count>
-<relevance>182155</relevance>
+<relevance>87514</relevance>
 <recid>title how to program a computer author jack collins</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">
-<md-title>Internet world</md-title>
-<md-date>1992</md-date>
-<md-description>Title from caption</md-description></location>
-<relevance>151795</relevance>
-<recid>title internet world</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">
-<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>
-<relevance>75897</relevance>
-<recid>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">
+<md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description><location id="localhost:9999/db2" name="db2">
 <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>
-<relevance>75897</relevance>
+<location id="localhost:9999/db1" name="db1">
+<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>2</count>
+<relevance>72928</relevance>
 <recid>title the computer bible</recid>
 </hit>
 <hit>
 
-<md-title>Internet</md-title>
-<md-title-remainder>mailing lists</md-title-remainder>
-<md-date>1993</md-date>
-<md-description>Includes index</md-description><location id="localhost:9999/db1" name="db1">
-<md-title>Internet</md-title>
-<md-title-remainder>mailing lists</md-title-remainder>
-<md-date>1993</md-date>
-<md-description>Includes index</md-description></location>
-<relevance>37949</relevance>
-<recid>title internet</recid>
-</hit>
-<hit>
-
-<md-title>A plan for community college computer development</md-title>
-<md-date>1971</md-date>
-<md-description>Cover title</md-description><location id="localhost:9999/db1" name="db1">
-<md-title>A plan for community college computer development</md-title>
-<md-date>1971</md-date>
-<md-description>Cover title</md-description></location>
-<relevance>32527</relevance>
-<recid>title a plan for community college computer development</recid>
-</hit>
-<hit>
-
-<md-title>Washington metropolitan area rail computer feasibility study;</md-title>
-<md-title-remainder>final report</md-title-remainder>
-<md-date>1971</md-date>
-<md-author>Englund, Carl R</md-author>
-<md-description>&quot;Contract DOT-UT-10003.&quot;</md-description><location id="localhost:9999/db1" name="db1">
-<md-title>Washington metropolitan area rail computer feasibility study;</md-title>
-<md-title-remainder>final report</md-title-remainder>
-<md-date>1971</md-date>
-<md-author>Englund, Carl R</md-author>
-<md-description>&quot;Contract DOT-UT-10003.&quot;</md-description></location>
-<relevance>32527</relevance>
-<recid>title washington metropolitan area rail computer feasibility study author englund carl r</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">
+<md-description>Scale of maps ca. 1:1,000,000</md-description><location id="localhost:9999/db2" name="db2">
+<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>
+<location id="localhost:9999/db1" name="db1">
 <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>
-<relevance>31624</relevance>
+<count>2</count>
+<relevance>30386</relevance>
 <recid>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">
+<md-date>1974</md-date><location id="localhost:9999/db2" name="db2">
+<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>
+<location id="localhost:9999/db1" name="db1">
 <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>
-<relevance>22769</relevance>
+<count>2</count>
+<relevance>21878</relevance>
 <recid>title computer processing of dynamic images from an anger scintillation camera</recid>
 </hit>
 <hit>
 
-<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><location id="localhost:9999/db1" name="db1">
-<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></location>
-<relevance>22769</relevance>
-<recid>title the use of passwords for controlled access to computer resources author wood helen m</recid>
-</hit>
-<hit>
-
-<md-title>Deuteronomy</md-title>
-<md-date>1968</md-date>
-<md-author>Oberst, Bruce</md-author><location id="localhost:9999/db1" name="db1">
-<md-title>Deuteronomy</md-title>
-<md-date>1968</md-date>
-<md-author>Oberst, Bruce</md-author></location>
-<relevance>0</relevance>
-<recid>title deuteronomy author oberst bruce</recid>
-</hit>
-<hit>
-
-<md-title>Four psalms</md-title>
-<md-title-remainder>XXIII, XXXVI, LII, CXXI</md-title-remainder>
-<md-date>1980</md-date>
-<md-author>Smith, George Adam</md-author><location id="localhost:9999/db1" name="db1">
-<md-title>Four psalms</md-title>
-<md-title-remainder>XXIII, XXXVI, LII, CXXI</md-title-remainder>
-<md-date>1980</md-date>
-<md-author>Smith, George Adam</md-author></location>
-<relevance>0</relevance>
-<recid>title four psalms author smith george adam</recid>
-</hit>
-<hit>
-
-<md-title>Info Canada</md-title>
-<md-date>1991</md-date>
-<md-description>Title from caption</md-description><location id="localhost:9999/db1" name="db1">
-<md-title>Info Canada</md-title>
-<md-date>1991</md-date>
-<md-description>Title from caption</md-description></location>
-<relevance>0</relevance>
-<recid>title info canada</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">
+<md-date>1977</md-date><location id="localhost:9999/db2" name="db2">
 <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>
+<location id="localhost:9999/db1" name="db1">
+<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>2</count>
 <relevance>0</relevance>
 <recid>title reconstruction tomography in diagnostic radiology and nuclear medicine</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>
-<md-author>Carter, Bill</md-author>
-<md-description>Includes index</md-description><location id="localhost:9999/db1" name="db1">
-<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>
-<md-author>Carter, Bill</md-author>
-<md-description>Includes index</md-description></location>
-<relevance>0</relevance>
-<recid>title the late shift author carter bill</recid>
-</hit>
-<hit>
-
-<md-title>The religious teachers of Greece</md-title>
-<md-date>1972</md-date>
-<md-author>Adam, James</md-author>
-<md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description><location id="localhost:9999/db1" name="db1">
-<md-title>The religious teachers of Greece</md-title>
-<md-date>1972</md-date>
-<md-author>Adam, James</md-author>
-<md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description></location>
-<relevance>0</relevance>
-<recid>title the religious teachers of greece author adam james</recid>
-</hit>
 </show>

diff --git a/test/test_facets_17.res b/test/test_facets_17.res
index 0f3cb21..c5d6b4c 100644 (file)
--- a/test/test_facets_17.res
+++ b/test/test_facets_17.res
@@ -4,14 +4,14 @@
 <term>
 <id>localhost:9999/db1</id>
 <name>db1</name>
-<frequency>17</frequency>
+<frequency>6</frequency>
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
 </term>
 <term>
 <id>localhost:9999/db2</id>
 <name>db2</name>
-<frequency>2</frequency>
+<frequency>6</frequency>
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
 </term>
@@ -23,12 +23,6 @@
 <term><name>author3</name><frequency>70</frequency></term>
 <term><name>author4</name><frequency>60</frequency></term>
 <term><name>Jack Collins</name><frequency>2</frequency></term>
-<term><name>Oberst, Bruce</name><frequency>1</frequency></term>
-<term><name>Carter, Bill</name><frequency>1</frequency></term>
-<term><name>Adam, James</name><frequency>1</frequency></term>
-<term><name>Smith, George Adam</name><frequency>1</frequency></term>
-<term><name>Englund, Carl R</name><frequency>1</frequency></term>
-<term><name>Wood, Helen M</name><frequency>1</frequency></term>
 <term><name>Mairs, John W</name><frequency>1</frequency></term>
 </list>
 <list name="subject">
@@ -37,16 +31,14 @@
 <term><name>subject2</name><frequency>80</frequency></term>
 <term><name>subject3</name><frequency>70</frequency></term>
 <term><name>subject4</name><frequency>60</frequency></term>
-<term><name>Bible</name><frequency>5</frequency></term>
-<term><name>Internet (Computer network)</name><frequency>2</frequency></term>
-<term><name>Community colleges</name><frequency>1</frequency></term>
-<term><name>Bible. O.T. Deuteronomy</name><frequency>1</frequency></term>
-<term><name>Greek literature</name><frequency>1</frequency></term>
-<term><name>Philosophy, Ancient</name><frequency>1</frequency></term>
-<term><name>Greece</name><frequency>1</frequency></term>
-<term><name>Computer networks</name><frequency>1</frequency></term>
-<term><name>Information networks</name><frequency>1</frequency></term>
-<term><name>Computer Systems</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>Imaging systems in medicine</name><frequency>1</frequency></term>
+<term><name>Bible. O.T</name><frequency>1</frequency></term>
+<term><name>Bible</name><frequency>1</frequency></term>
+<term><name>Cartography</name><frequency>1</frequency></term>
+<term><name>Puget Sound region (Wash.)</name><frequency>1</frequency></term>
+<term><name>Tomography</name><frequency>1</frequency></term>
 </list>
 <list name="date">
 <term><name>date0</name><frequency>100</frequency></term>
@@ -54,15 +46,9 @@
 <term><name>date2</name><frequency>80</frequency></term>
 <term><name>date3</name><frequency>70</frequency></term>
 <term><name>date4</name><frequency>60</frequency></term>
-<term><name>1977</name><frequency>3</frequency></term>
 <term><name>1974</name><frequency>2</frequency></term>
-<term><name>1980</name><frequency>2</frequency></term>
-<term><name>1971</name><frequency>2</frequency></term>
-<term><name>1993</name><frequency>2</frequency></term>
-<term><name>1991</name><frequency>1</frequency></term>
-<term><name>1992</name><frequency>1</frequency></term>
-<term><name>1972</name><frequency>1</frequency></term>
-<term><name>1968</name><frequency>1</frequency></term>
+<term><name>1980</name><frequency>1</frequency></term>
 <term><name>1973</name><frequency>1</frequency></term>
+<term><name>1977</name><frequency>1</frequency></term>
 </list>
 </termlist>

diff --git a/test/test_facets_18.res b/test/test_facets_18.res
index 6010961..c5d6b4c 100644 (file)
--- a/test/test_facets_18.res
+++ b/test/test_facets_18.res
@@ -4,14 +4,14 @@
 <term>
 <id>localhost:9999/db1</id>
 <name>db1</name>
-<frequency>17</frequency>
+<frequency>6</frequency>
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
 </term>
 <term>
 <id>localhost:9999/db2</id>
 <name>db2</name>
-<frequency>2</frequency>
+<frequency>6</frequency>
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
 </term>
@@ -23,13 +23,7 @@
 <term><name>author3</name><frequency>70</frequency></term>
 <term><name>author4</name><frequency>60</frequency></term>
 <term><name>Jack Collins</name><frequency>2</frequency></term>
-<term><name>Wood, Helen M</name><frequency>1</frequency></term>
 <term><name>Mairs, John W</name><frequency>1</frequency></term>
-<term><name>Oberst, Bruce</name><frequency>1</frequency></term>
-<term><name>Carter, Bill</name><frequency>1</frequency></term>
-<term><name>Adam, James</name><frequency>1</frequency></term>
-<term><name>Smith, George Adam</name><frequency>1</frequency></term>
-<term><name>Englund, Carl R</name><frequency>1</frequency></term>
 </list>
 <list name="subject">
 <term><name>subject0</name><frequency>100</frequency></term>
@@ -37,14 +31,12 @@
 <term><name>subject2</name><frequency>80</frequency></term>
 <term><name>subject3</name><frequency>70</frequency></term>
 <term><name>subject4</name><frequency>60</frequency></term>
-<term><name>Bible</name><frequency>5</frequency></term>
-<term><name>Internet (Computer network)</name><frequency>2</frequency></term>
-<term><name>Information networks</name><frequency>1</frequency></term>
-<term><name>Computer Systems</name><frequency>1</frequency></term>
-<term><name>Online Systems</name><frequency>1</frequency></term>
-<term><name>Letterman, David</name><frequency>1</frequency></term>
-<term><name>Leno, Jay</name><frequency>1</frequency></term>
-<term><name>Tonight show (Television program)</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>Imaging systems in medicine</name><frequency>1</frequency></term>
+<term><name>Bible. O.T</name><frequency>1</frequency></term>
+<term><name>Bible</name><frequency>1</frequency></term>
+<term><name>Cartography</name><frequency>1</frequency></term>
 <term><name>Puget Sound region (Wash.)</name><frequency>1</frequency></term>
 <term><name>Tomography</name><frequency>1</frequency></term>
 </list>
@@ -54,15 +46,9 @@
 <term><name>date2</name><frequency>80</frequency></term>
 <term><name>date3</name><frequency>70</frequency></term>
 <term><name>date4</name><frequency>60</frequency></term>
-<term><name>1977</name><frequency>3</frequency></term>
-<term><name>1980</name><frequency>2</frequency></term>
 <term><name>1974</name><frequency>2</frequency></term>
-<term><name>1971</name><frequency>2</frequency></term>
-<term><name>1993</name><frequency>2</frequency></term>
-<term><name>1991</name><frequency>1</frequency></term>
-<term><name>1992</name><frequency>1</frequency></term>
-<term><name>1972</name><frequency>1</frequency></term>
-<term><name>1968</name><frequency>1</frequency></term>
+<term><name>1980</name><frequency>1</frequency></term>
 <term><name>1973</name><frequency>1</frequency></term>
+<term><name>1977</name><frequency>1</frequency></term>
 </list>
 </termlist>

diff --git a/test/test_facets_19.res b/test/test_facets_19.res
index 5d3e9eb..d793ae4 100644 (file)
--- a/test/test_facets_19.res
+++ b/test/test_facets_19.res
@@ -2,15 +2,15 @@
 <bytarget><status>OK</status>
 <target><id>localhost:9999/db1</id>
 <name>db1</name>
-<hits>17</hits>
+<hits>6</hits>
 <diagnostic>0</diagnostic>
-<records>17</records>
+<records>6</records>
 <state>Client_Idle</state>
 </target>
 <target><id>localhost:9999/db2</id>
 <name>db2</name>
-<hits>2</hits>
+<hits>6</hits>
 <diagnostic>0</diagnostic>
-<records>2</records>
+<records>6</records>
 <state>Client_Idle</state>
 </target></bytarget>
\ No newline at end of file

diff --git a/test/test_facets_23.res b/test/test_facets_23.res
index 2aaa2f6..6aef931 100644 (file)
--- a/test/test_facets_23.res
+++ b/test/test_facets_23.res
@@ -2,10 +2,10 @@
 <show>
 <status>OK</status>
 <activeclients>0</activeclients>
-<merged>10</merged>
-<total>12</total>
+<merged>8</merged>
+<total>9</total>
 <start>0</start>
-<num>10</num>
+<num>8</num>
 <hit>
 
 <md-title>How to program a computer</md-title>
@@ -16,70 +16,31 @@
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author></location>
 <count>2</count>
-<relevance>20882</relevance>
+<relevance>28267</relevance>
 <recid>title how to program a computer author jack collins</recid>
 </hit>
 <hit>
 
-<md-title>How to program a computer</md-title>
-<md-author>Jack Collins</md-author><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
-<md-title>How to program a computer</md-title>
-<md-author>Jack Collins</md-author>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
-<md-title>How to program a computer</md-title>
-<md-author>Jack Collins</md-author>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<count>2</count>
-<relevance>20882</relevance>
-<recid>title how to program a computer author jack collins medium book</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="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-date>1977</md-date><location id="localhost:9999/db2" name="db2">
 <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-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>17402</relevance>
-<recid>title computer science technology author medium book</recid>
+<md-date>1977</md-date></location>
+<relevance>23556</relevance>
+<recid>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="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description><location id="localhost:9999/db2" name="db2">
 <md-title>The Computer Bible</md-title>
 <md-date>1973-1980</md-date>
-<md-description tag="500">Hebrew and Greek; introductions in English</md-description>
-<md-description tag="500">Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>17402</relevance>
-<recid>title the computer bible author medium book</recid>
-</hit>
-<hit>
-
-<md-title>A plan for community college computer development</md-title>
-<md-date>1971</md-date>
-<md-description>Cover title</md-description><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
-<md-title>A plan for community college computer development</md-title>
-<md-date>1971</md-date>
-<md-description tag="500">Cover title</md-description>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>7458</relevance>
-<recid>title a plan for community college computer development author medium book</recid>
+<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>
+<relevance>23556</relevance>
+<recid>title the computer bible</recid>
 </hit>
 <hit>
 
@@ -87,17 +48,14 @@
 <md-title-remainder>final report</md-title-remainder>
 <md-date>1971</md-date>
 <md-author>Englund, Carl R</md-author>
-<md-description>&quot;Contract DOT-UT-10003.&quot;</md-description><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-description>&quot;Contract DOT-UT-10003.&quot;</md-description><location id="localhost:9999/db2" name="db2">
 <md-title>Washington metropolitan area rail computer feasibility study;</md-title>
 <md-title-remainder>final report</md-title-remainder>
 <md-date>1971</md-date>
 <md-author>Englund, Carl R</md-author>
-<md-description tag="500">&quot;Contract DOT-UT-10003.&quot;</md-description>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>7458</relevance>
-<recid>title washington metropolitan area rail computer feasibility study author englund carl r medium book</recid>
+<md-description>&quot;Contract DOT-UT-10003.&quot;</md-description></location>
+<relevance>10095</relevance>
+<recid>title washington metropolitan area rail computer feasibility study author englund carl r</recid>
 </hit>
 <hit>
 
@@ -105,63 +63,46 @@
 <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="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-description>Scale of maps ca. 1:1,000,000</md-description><location id="localhost:9999/db2" name="db2">
 <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 tag="500">Scale of maps ca. 1:1,000,000</md-description>
-<md-description tag="504">Bibliography: p. 4</md-description>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>7251</relevance>
-<recid>title the puget sound region author mairs john w medium book</recid>
+<md-description>Scale of maps ca. 1:1,000,000</md-description></location>
+<relevance>9815</relevance>
+<recid>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>
-<md-description>Includes bibliographical references and index</md-description><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-date>1974</md-date><location id="localhost:9999/db2" name="db2">
 <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>
-<md-description tag="504">Includes bibliographical references and index</md-description>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>5220</relevance>
-<recid>title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
+<md-date>1974</md-date></location>
+<relevance>7067</relevance>
+<recid>title computer processing of dynamic images from an anger scintillation camera</recid>
 </hit>
 <hit>
 
 <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><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-author>Wood, Helen M</md-author><location id="localhost:9999/db2" name="db2">
 <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>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
-<relevance>5220</relevance>
-<recid>title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
+<md-author>Wood, Helen M</md-author></location>
+<relevance>7067</relevance>
+<recid>title the use of passwords for controlled access to computer resources author wood helen m</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>
-<md-description>Includes bibliographical references and index</md-description><location id="z3950.indexdata.com/marc" name="Index Data MARC test server">
+<md-date>1977</md-date><location id="localhost:9999/db2" name="db2">
 <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>
-<md-description tag="504">Includes bibliographical references and index</md-description>
-<md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
-<md-test-usersetting-2>test-usersetting-2 data: 
-        YYYYYYYYY</md-test-usersetting-2></location>
+<md-date>1977</md-date></location>
 <relevance>0</relevance>
-<recid>title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book</recid>
+<recid>title reconstruction tomography in diagnostic radiology and nuclear medicine</recid>
 </hit>
 </show>

diff --git a/test/test_facets_24.res b/test/test_facets_24.res
index fa09272..613a5a7 100644 (file)
--- a/test/test_facets_24.res
+++ b/test/test_facets_24.res
@@ -2,43 +2,37 @@
 <activeclients>0</activeclients>
 <list name="xtargets">
 <term>
-<id>z3950.indexdata.com/marc</id>
-<name>Index Data MARC test server</name>
-<frequency>10</frequency>
-<state>Client_Idle</state>
-<diagnostic>0</diagnostic>
-</term>
-<term>
 <id>localhost:9999/db2</id>
 <name>db2</name>
-<frequency>2</frequency>
+<frequency>9</frequency>
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
 </term>
 </list>
 <list name="author">
-<term><name>Jack Collins</name><frequency>4</frequency></term>
+<term><name>Jack Collins</name><frequency>2</frequency></term>
 <term><name>Mairs, John W</name><frequency>1</frequency></term>
 <term><name>Wood, Helen M</name><frequency>1</frequency></term>
 <term><name>Englund, Carl R</name><frequency>1</frequency></term>
 </list>
 <list name="subject">
-<term><name>Community colleges</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>Imaging systems in medicine</name><frequency>1</frequency></term>
+<term><name>Bible. O.T</name><frequency>1</frequency></term>
+<term><name>Bible</name><frequency>1</frequency></term>
 <term><name>Cartography</name><frequency>1</frequency></term>
+<term><name>Puget Sound region (Wash.)</name><frequency>1</frequency></term>
 <term><name>Tomography</name><frequency>1</frequency></term>
 <term><name>Optical pattern recognition</name><frequency>1</frequency></term>
 <term><name>Computers</name><frequency>1</frequency></term>
 <term><name>Railroads</name><frequency>1</frequency></term>
-<term><name>Universities and colleges</name><frequency>1</frequency></term>
-<term><name>Radioisotope scanning</name><frequency>1</frequency></term>
 </list>
 <list name="date">
 <term><name>1977</name><frequency>3</frequency></term>
 <term><name>1974</name><frequency>2</frequency></term>
-<term><name>1971</name><frequency>2</frequency></term>
 <term><name>1980</name><frequency>1</frequency></term>
 <term><name>1973</name><frequency>1</frequency></term>
+<term><name>1971</name><frequency>1</frequency></term>
 </list>
 </termlist>

diff --git a/test/test_facets_6.res b/test/test_facets_6.res
index 699e21c..f7e2356 100644 (file)
--- a/test/test_facets_6.res
+++ b/test/test_facets_6.res
@@ -14,7 +14,7 @@
 <term><name>Mairs, John W</name><frequency>1</frequency></term>
 </list>
 <list name="subject">
-<term><name>Optical pattern recognition</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>Imaging systems in medicine</name><frequency>1</frequency></term>
 <term><name>Bible. O.T</name><frequency>1</frequency></term>
@@ -22,7 +22,7 @@
 <term><name>Cartography</name><frequency>1</frequency></term>
 <term><name>Puget Sound region (Wash.)</name><frequency>1</frequency></term>
 <term><name>Tomography</name><frequency>1</frequency></term>
-<term><name>Radioisotope scanning</name><frequency>1</frequency></term>
+<term><name>Optical pattern recognition</name><frequency>1</frequency></term>
 </list>
 <list name="date">
 <term><name>1974</name><frequency>2</frequency></term>

diff --git a/test/test_facets_9.res b/test/test_facets_9.res
index 63b68d7..ee0c811 100644 (file)
--- a/test/test_facets_9.res
+++ b/test/test_facets_9.res
@@ -2,10 +2,10 @@
 <show>
 <status>OK</status>
 <activeclients>0</activeclients>
-<merged>6</merged>
+<merged>3</merged>
 <total>8</total>
 <start>0</start>
-<num>6</num>
+<num>3</num>
 <hit>
 
 <md-title>How to program a computer</md-title>
@@ -18,23 +18,15 @@
 <location id="localhost:9999/db1" name="db1">
 <md-title>How to program a computer</md-title>
 <md-author>Jack Collins</md-author></location>
-<count>3</count>
-<relevance>48071</relevance>
+<location id="localhost:9999/db1" name="db1">
+<md-title>How to program a computer</md-title>
+<md-author>Jack Collins</md-author></location>
+<count>4</count>
+<relevance>480000</relevance>
 <recid>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/db2" name="db2">
-<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>
-<relevance>26706</relevance>
-<recid>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/db2" name="db2">
@@ -42,44 +34,29 @@
 <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>
-<relevance>26706</relevance>
+<location id="localhost:9999/db1" name="db1">
+<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>2</count>
+<relevance>400000</relevance>
 <recid>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/db2" name="db2">
-<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>
-<relevance>11127</relevance>
-<recid>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/db2" name="db2">
 <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>
-<relevance>8011</relevance>
+<location id="localhost:9999/db1" name="db1">
+<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>2</count>
+<relevance>120000</relevance>
 <recid>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/db2" name="db2">
-<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>
-<relevance>0</relevance>
-<recid>title reconstruction tomography in diagnostic radiology and nuclear medicine</recid>
-</hit>
 </show>

diff --git a/test/test_facets_urls b/test/test_facets_urls
index 769e1c0..b523234 100644 (file)
--- a/test/test_facets_urls
+++ b/test/test_facets_urls
@@ -1,24 +1,24 @@
 http://localhost:9763/search.pz2?command=init&clear=1
 http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Blocalhost:9999%2Fdb1%5D=db1&pz:requestsyntax%5Blocalhost:9999%2Fdb1%5D=usmarc&pz:nativesyntax%5Blocalhost:9999%2Fdb1%5D=txml&pz:xslt%5Blocalhost:9999%2Fdb1%5D=tmarc.xsl&pz:termlist_term_count%5Blocalhost:9999%2Fdb1%5D=0
-http://localhost:9763/search.pz2?session=1&command=search&query=computer
+http://localhost:9763/search.pz2?session=1&command=search&query=7+and+computer
 http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
 http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Blocalhost:9999%2Fdb2%5D=db2&pz:requestsyntax%5Blocalhost:9999%2Fdb2%5D=usmarc&pz:nativesyntax%5Blocalhost:9999%2Fdb2%5D=txml&pz:xslt%5Blocalhost:9999%2Fdb2%5D=tmarc.xsl&pz:termlist_term_count%5Blocalhost:9999%2Fdb2%5D=5
-http://localhost:9763/search.pz2?session=1&command=search&query=computer
+http://localhost:9763/search.pz2?session=1&command=search&query=4+and+computer
 http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
-http://localhost:9763/search.pz2?session=1&command=search&query=computer
+http://localhost:9763/search.pz2?session=1&command=search&query=8+and+computer
 http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
-http://localhost:9763/search.pz2?session=1&command=search&query=computer
+http://localhost:9763/search.pz2?session=1&command=search&query=6+and+computer
 http://localhost:9763/search.pz2?session=1&command=show
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
 10 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?command=init
 http://localhost:9763/search.pz2?session=2&command=settings&pz:name%5Blocalhost:9999%2Fdb2%5D=db2&pz:requestsyntax%5Blocalhost:9999%2Fdb2%5D=usmarc&pz:nativesyntax%5Blocalhost:9999%2Fdb2%5D=txml&pz:xslt%5Blocalhost:9999%2Fdb2%5D=tmarc.xsl&pz:apdulog%5Blocalhost:9999%2Fdb2%5D=1
-http://localhost:9763/search.pz2?session=2&command=search&query=computer
+http://localhost:9763/search.pz2?session=2&command=search&query=9+and+computer
 2 http://localhost:9763/search.pz2?session=2&command=show&block=1
 http://localhost:9763/search.pz2?session=2&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate