Update tests for upd z3950.indexdata.com; disable Solr tests

test/Makefile.am

@@ -5,8 +5,7 @@ AUTOMAKE_OPTIONS = serial-tests
 solr_tests = test_solr.sh test_termlist_block.sh test_limit_limitmap.sh test_sort.sh
 check_SCRIPTS = test_http.sh test_icu.sh test_post.sh \
  test_settings.sh test_turbomarcxml.sh test_facets.sh \
- test_url.sh test_filter.sh test_sru.sh test_perf.sh \
- $(solr_tests)
+ test_url.sh test_filter.sh test_sru.sh test_perf.sh
 
 EXTRA_DIST = run_pazpar2.sh marc21_test.xsl tmarc.xsl solr-pz2.xsl \
 	z3950_indexdata_com_marc.xml \

test/test_facets_24.res

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <show><status>OK</status>
 <activeclients>0</activeclients>
-<merged>8</merged>
-<total>9</total>
+<merged>9</merged>
+<total>10</total>
 <start>0</start>
-<num>8</num>
+<num>9</num>
 <hit>
  <md-title>How to program a computer</md-title>
  <md-author>Jack Collins</md-author>
@@ -19,7 +19,7 @@
   <md-author>Jack Collins</md-author>
  </location>
  <count>2</count>
- <relevance>53554</relevance>
+ <relevance>48160</relevance>
  <recid>content: title how to program a computer author jack collins</recid>
 </hit>
 <hit>
@@ -33,7 +33,7 @@
   <md-date>1977</md-date>
  </location>
  <count>1</count>
- <relevance>44628</relevance>
+ <relevance>40134</relevance>
  <recid>content: title computer science technology</recid>
 </hit>
 <hit>
@@ -48,7 +48,7 @@
   <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
  </location>
  <count>1</count>
- <relevance>44628</relevance>
+ <relevance>40134</relevance>
  <recid>content: title the computer bible</recid>
 </hit>
 <hit>
@@ -66,7 +66,7 @@
   <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
  </location>
  <count>1</count>
- <relevance>19126</relevance>
+ <relevance>17200</relevance>
  <recid>content: title washington metropolitan area rail computer feasibility study author englund carl r</recid>
 </hit>
 <hit>
@@ -84,7 +84,7 @@
   <md-description>Scale of maps ca. 1:1,000,000</md-description>
  </location>
  <count>1</count>
- <relevance>18595</relevance>
+ <relevance>16722</relevance>
  <recid>content: title the puget sound region author mairs john w</recid>
 </hit>
 <hit>
@@ -98,7 +98,7 @@
   <md-date>1974</md-date>
  </location>
  <count>1</count>
- <relevance>13388</relevance>
+ <relevance>12040</relevance>
  <recid>content: title computer processing of dynamic images from an anger scintillation camera</recid>
 </hit>
 <hit>
@@ -112,9 +112,26 @@
   <md-author>Wood, Helen M</md-author>
  </location>
  <count>1</count>
- <relevance>13388</relevance>
+ <relevance>12040</relevance>
  <recid>content: title the use of passwords for controlled access to computer resources author wood helen m</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" checksum="2614320583">
+  <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>
+ <count>1</count>
+ <relevance>12040</relevance>
+ <recid>content: title the use of passwords for controlled access to computer resources author wood helen m medium book</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>

test/test_facets_25.res

@@ -8,6 +8,13 @@
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
 </term>
+<term>
+<id>z3950.indexdata.com/marc</id>
+<name>Index Data MARC test server</name>
+<frequency>1</frequency>
+<state>Client_Idle</state>
+<diagnostic>0</diagnostic>
+</term>
 </list>
 <list name="author">
 <term><name>author0</name><frequency>100</frequency></term>
@@ -20,6 +27,7 @@
 <term><name>author7</name><frequency>30</frequency></term>
 <term><name>author8</name><frequency>20</frequency></term>
 <term><name>author9</name><frequency>10</frequency></term>
+<term><name>Wood, Helen M</name><frequency>1</frequency></term>
 </list>
 <list name="subject">
 <term><name>subject0</name><frequency>100</frequency></term>
@@ -32,6 +40,7 @@
 <term><name>subject7</name><frequency>30</frequency></term>
 <term><name>subject8</name><frequency>20</frequency></term>
 <term><name>subject9</name><frequency>10</frequency></term>
+<term><name>Computers</name><frequency>1</frequency></term>
 </list>
 <list name="date">
 <term><name>date0</name><frequency>100</frequency></term>
@@ -44,6 +53,7 @@
 <term><name>date7</name><frequency>30</frequency></term>
 <term><name>date8</name><frequency>20</frequency></term>
 <term><name>date9</name><frequency>10</frequency></term>
+<term><name>1977</name><frequency>1</frequency></term>
 </list>
 <list name="medium"/>
 </termlist>

test/test_facets_27.res

@@ -8,6 +8,13 @@
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
 </term>
+<term>
+<id>z3950.indexdata.com/marc</id>
+<name>Index Data MARC test server</name>
+<frequency>1</frequency>
+<state>Client_Idle</state>
+<diagnostic>0</diagnostic>
+</term>
 </list>
 <list name="author">
 <term><name>author0</name><frequency>100</frequency></term>
@@ -20,6 +27,7 @@
 <term><name>author7</name><frequency>30</frequency></term>
 <term><name>author8</name><frequency>20</frequency></term>
 <term><name>author9</name><frequency>10</frequency></term>
+<term><name>Wood, Helen M</name><frequency>1</frequency></term>
 </list>
 <list name="subject">
 <term><name>subject0</name><frequency>100</frequency></term>
@@ -32,6 +40,7 @@
 <term><name>subject7</name><frequency>30</frequency></term>
 <term><name>subject8</name><frequency>20</frequency></term>
 <term><name>subject9</name><frequency>10</frequency></term>
+<term><name>Computers</name><frequency>1</frequency></term>
 </list>
 <list name="date">
 <term><name>date0</name><frequency>100</frequency></term>
@@ -44,6 +53,7 @@
 <term><name>date7</name><frequency>30</frequency></term>
 <term><name>date8</name><frequency>20</frequency></term>
 <term><name>date9</name><frequency>10</frequency></term>
+<term><name>1977</name><frequency>1</frequency></term>
 </list>
 <list name="medium"/>
 </termlist>

test/test_filter_12.res

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <show><status>OK</status>
 <activeclients>0</activeclients>
-<merged>12</merged>
-<total>12</total>
+<merged>11</merged>
+<total>11</total>
 <start>0</start>
-<num>12</num>
+<num>11</num>
 <hit>
  <md-title>The late shift</md-title>
  <md-title-remainder>Letterman, Leno, and the network battle for the night</md-title-remainder>
@@ -28,7 +28,7 @@
   <md-description tag="500">Includes index</md-description>
  </location>
  <count>1</count>
- <relevance>51972</relevance>
+ <relevance>56722</relevance>
  <recid>content: title the late shift author carter bill medium book</recid>
 </hit>
 <hit>
@@ -47,7 +47,7 @@
   <md-description tag="500">Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
  </location>
  <count>1</count>
- <relevance>33410</relevance>
+ <relevance>36464</relevance>
  <recid>content: title the computer bible author medium book</recid>
 </hit>
 <hit>
@@ -70,7 +70,7 @@
   <md-description tag="504">Includes bibliographical references</md-description>
  </location>
  <count>1</count>
- <relevance>29158</relevance>
+ <relevance>31823</relevance>
  <recid>content: title the religious teachers of greece author adam james medium book</recid>
 </hit>
 <hit>
@@ -93,7 +93,7 @@
   <md-description tag="504">Bibliography: p. 4</md-description>
  </location>
  <count>1</count>
- <relevance>25058</relevance>
+ <relevance>27348</relevance>
  <recid>content: title the puget sound region author mairs john w medium book</recid>
 </hit>
 <hit>
@@ -111,7 +111,7 @@
   <md-description tag="504">Includes bibliographical references and index</md-description>
  </location>
  <count>1</count>
- <relevance>20881</relevance>
+ <relevance>22790</relevance>
  <recid>content: title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book</recid>
 </hit>
 <hit>
@@ -133,7 +133,7 @@
   <md-description tag="504">Includes bibliographical references and index</md-description>
  </location>
  <count>1</count>
- <relevance>16705</relevance>
+ <relevance>18232</relevance>
  <recid>content: title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
 </hit>
 <hit>
@@ -144,7 +144,7 @@
  <md-subject>Dropouts</md-subject>
  <md-description>Distributed to depository libraries in microfiche</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="61276177">
+    name="Index Data MARC test server" checksum="4182051184">
   <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>
@@ -154,7 +154,7 @@
   <md-description tag="500">Distributed to depository libraries in microfiche</md-description>
  </location>
  <count>1</count>
- <relevance>13921</relevance>
+ <relevance>15193</relevance>
  <recid>content: title dealing with dropouts author paulu nancy medium</recid>
 </hit>
 <hit>
@@ -165,7 +165,7 @@
  <md-subject>Handicapped children</md-subject>
  <md-description>Distributed to depository libraries in microfiche</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="235468466">
+    name="Index Data MARC test server" checksum="61276177">
   <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>
@@ -175,7 +175,7 @@
   <md-description tag="500">Distributed to depository libraries in microfiche</md-description>
  </location>
  <count>1</count>
- <relevance>13364</relevance>
+ <relevance>14585</relevance>
  <recid>content: title national dissemination model for the i m special program of physical education for the handicapped author medium</recid>
 </hit>
 <hit>
@@ -191,7 +191,7 @@
   <md-subject>Computers</md-subject>
  </location>
  <count>1</count>
- <relevance>10023</relevance>
+ <relevance>10939</relevance>
  <recid>content: title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
 </hit>
 <hit>
@@ -207,33 +207,9 @@
   <md-subject>Optical pattern recognition</md-subject>
  </location>
  <count>1</count>
- <relevance>5966</relevance>
+ <relevance>6511</relevance>
  <recid>content: title computer science technology author medium book</recid>
 </hit>
-<hit>
- <md-title>Technology programs that work</md-title>
- <md-date>1984</md-date>
- <md-subject>United States</md-subject>
- <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="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4007858895">
-  <md-title>Technology programs that work</md-title>
-  <md-date>1984</md-date>
-  <md-subject>United States</md-subject>
-  <md-subject>Educational technology</md-subject>
-  <md-subject>Federal aid to education</md-subject>
-  <md-description tag="500">&quot;Spons agency Office of Educational Research and Improvement&quot;--Doc. resume</md-description>
-  <md-description tag="500">&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>
-  <md-description tag="500">Distributed to depository libraries in microfiche</md-description>
-  <md-description tag="500">&quot;December 1984.&quot;</md-description>
-  <md-description tag="500">Includes indexes</md-description>
- </location>
- <count>1</count>
- <relevance>3341</relevance>
- <recid>content: title technology programs that work author medium book</recid>
-</hit>
 <hit>
  <md-title>Check this out</md-title>
  <md-title-remainder>library program models</md-title-remainder>
@@ -246,7 +222,7 @@
  <md-subject>Public libraries</md-subject>
  <md-description>Distributed to depository libraries in microfiche</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4182051184">
+    name="Index Data MARC test server" checksum="4007858895">
   <md-title>Check this out</md-title>
   <md-title-remainder>library program models</md-title-remainder>
   <md-date>1987</md-date>

test/test_filter_13.res

@@ -15,7 +15,6 @@
 <term><name>1972</name><frequency>1</frequency></term>
 <term><name>1973</name><frequency>1</frequency></term>
 <term><name>1980</name><frequency>1</frequency></term>
-<term><name>1984</name><frequency>1</frequency></term>
 <term><name>1986</name><frequency>1</frequency></term>
 <term><name>1993</name><frequency>1</frequency></term>
 </list>
@@ -25,8 +24,6 @@
 <term><name>Cartography</name><frequency>1</frequency></term>
 <term><name>Computers</name><frequency>1</frequency></term>
 <term><name>Dropouts</name><frequency>1</frequency></term>
-<term><name>Educational technology</name><frequency>1</frequency></term>
-<term><name>Federal aid to education</name><frequency>1</frequency></term>
 <term><name>Greece</name><frequency>1</frequency></term>
 <term><name>Greek literature</name><frequency>1</frequency></term>
 <term><name>Handicapped children</name><frequency>1</frequency></term>
@@ -35,12 +32,14 @@
 <term><name>Leno, Jay</name><frequency>1</frequency></term>
 <term><name>Letterman, David</name><frequency>1</frequency></term>
 <term><name>Libraries and community</name><frequency>1</frequency></term>
+<term><name>Libraries and education</name><frequency>1</frequency></term>
+<term><name>Optical pattern recognition</name><frequency>1</frequency></term>
 </list>
 <list name="xtargets">
 <term>
 <id>z3950.indexdata.com/marc</id>
 <name>Index Data MARC test server</name>
-<frequency>12</frequency>
+<frequency>11</frequency>
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
 </term>