test_solr.sh uses stable SOLR test server

diff --git a/test/Makefile.am b/test/Makefile.am
index 10b50e5..b23063e 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,7 @@
 # This file is part of Pazpar2.
-check_SCRIPTS = test_http.sh test_icu.sh test_post.sh test_settings.sh test_turbomarcxml.sh test_facets.sh 
-# Need newer yaz: test_solr.sh
+check_SCRIPTS = test_http.sh test_icu.sh test_post.sh \
+ test_settings.sh test_turbomarcxml.sh test_facets.sh \
+ test_solr.sh
 
 EXTRA_DIST = run_pazpar2.sh marc21_test.xsl tmarc.xsl \
        z3950_indexdata_com_marc.xml \

diff --git a/test/test_solr.urls b/test/test_solr.urls
index 57c2842..3a5b3ef 100644 (file)
--- a/test/test_solr.urls
+++ b/test/test_solr.urls
@@ -1,9 +1,5 @@
 http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=1&command=settings&full_text_target%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=NO&pz%3Atermlist_term_count%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=10&use_url_proxy%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Apiggyback%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Apreferred%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Acclmap%3Asu%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Asru%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=solr&use_thumbnails%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Acclmap%3Adate%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Ddate&medium%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=web&pz%3Aname%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=Oaister+%28SOLR%29&pz%3Acclmap%3Aissn%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=u%3D8&pz%3Acclmap%3Ati%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Aau%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Axslt%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Acclmap%3Aterm%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtext+s%3Dal&pz%3Acclmap%3Aisbn%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Aqueryencoding%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=UTF-8&pz%3Aoption_recordfilter%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=remote&full_text_target%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=NO&pz%3Atermlist_term_count%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=10&use_url_proxy%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Apiggyback%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Apreferred%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Ablock_timeout%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=2&pz%3Acclmap%3Asu%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Asru%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=solr&use_thumbnails%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Aname%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=LOC+%28SOLR%29&pz%3Acclmap%3Aissn%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=u%3D8&pz%3Acclmap%3Ati%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Aau%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Axslt%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Acclmap%3Aterm%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtext+s%3Dal&pz%3Acclmap%3Aisbn%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Aqueryencoding%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=UTF-8&pz%3Aoption_recordfilter%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=remote
+http://localhost:9763/search.pz2?session=1&command=settings&pz%3Atermlist_term_count%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=10&use_url_proxy%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=0&pz%3Apiggyback%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=1&pz%3Apreferred%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=1&pz%3Acclmap%3Asu%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Asru%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=solr&use_thumbnails%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=0&pz%3Acclmap%3Adate%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=1%3Ddate&medium%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=web&pz%3Aname%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=ocs_test&pz%3Acclmap%3Aissn%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=u%3D8&pz%3Acclmap%3Ati%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Aau%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Axslt%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Acclmap%3Aterm%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=1%3Dtext+s%3Dal&pz%3Acclmap%3Aisbn%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Aqueryencoding%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=UTF-8&pz%3Aoption_recordfilter%5Bopencontent-solr:8989%2Fsolr%2Fselect%5D=remote
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-http://localhost:9763/search.pz2?session=1&command=show&block=preferred
-http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
-http://localhost:9763/search.pz2?session=1&command=settings&pz%3Arecordfilter%5Bocs-oaister.indexdata.com%2Fsolr%2Fselect%5D=medium%3Dmicroform&pz%3Arecordfilter%5Bocs-loc.indexdata.com%2Fsolr%2Fselect%5D=medium%3Dmicroform
-http://localhost:9763/search.pz2?session=1&command=search&query=water
-http://localhost:9763/search.pz2?session=1&command=show&block=preferred
+1 http://localhost:9763/search.pz2?session=1&command=show&block=preferred
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium

diff --git a/test/test_solr_10.res b/test/test_solr_10.res
deleted file mode 100644 (file)
index 42534e3..0000000
--- a/test/test_solr_10.res
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings><status>OK</status></settings>
\ No newline at end of file

diff --git a/test/test_solr_11.res b/test/test_solr_11.res
deleted file mode 100644 (file)
index ab63fe6..0000000
--- a/test/test_solr_11.res
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<search><status>OK</status></search>
\ No newline at end of file

diff --git a/test/test_solr_12.res b/test/test_solr_12.res
deleted file mode 100644 (file)
index ae1f306..0000000
--- a/test/test_solr_12.res
+++ /dev/null
@@ -1,372 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<show>
-<status>OK</status>
-<activeclients>0</activeclients>
-<merged>185</merged>
-<total>592328</total>
-<start>0</start>
-<num>20</num>
-<hit>
-
-<md-title>California water plan update</md-title>
-<md-date>1998</md-date>
-<md-author>California. Dept. of Water Resources; Bateni, Naser J</md-author>
-<md-description>&quot;November 1998.&quot;</md-description>
-<md-medium>other</md-medium><location id="ocs-oaister.indexdata.com/solr/select" name="Oaister (SOLR)">
-<md-title>California water plan update</md-title>
-<md-date>1998</md-date>
-<md-author>California. Dept. of Water Resources; Bateni, Naser J</md-author>
-<md-description>&quot;November 1998.&quot;</md-description>
-<md-medium>other</md-medium></location>
-<location id="ocs-oaister.indexdata.com/solr/select" name="Oaister (SOLR)">
-<md-title>California water plan update</md-title>
-<md-date>1998</md-date>
-<md-author>California. Dept. of Water Resources; Bateni, Naser J</md-author>
-<md-description>&quot;November 1998.&quot;</md-description>
-<md-medium>other</md-medium></location>
-<count>2</count>
-<relevance>30982</relevance>
-<recid>title california water plan update author california dept of water resources bateni naser j medium other</recid>
-</hit>
-<hit>
-
-<md-title>California water plan update</md-title>
-<md-date>1994</md-date>
-<md-author>Bateni, Naser J; California. Dept. of Water Resources</md-author>
-<md-description>&quot;October 1994.&quot;</md-description>
-<md-medium>other</md-medium><location id="ocs-oaister.indexdata.com/solr/select" name="Oaister (SOLR)">
-<md-title>California water plan update</md-title>
-<md-date>1994</md-date>
-<md-author>Bateni, Naser J; California. Dept. of Water Resources</md-author>
-<md-description>&quot;October 1994.&quot;</md-description>
-<md-medium>other</md-medium></location>
-<location id="ocs-oaister.indexdata.com/solr/select" name="Oaister (SOLR)">
-<md-title>California water plan update</md-title>
-<md-date>1994</md-date>
-<md-author>Bateni, Naser J; California. Dept. of Water Resources</md-author>
-<md-description>&quot;October 1994.&quot;</md-description>
-<md-medium>other</md-medium></location>
-<count>2</count>
-<relevance>26448</relevance>
-<recid>title california water plan update author bateni naser j california dept of water resources medium other</recid>
-</hit>
-<hit>
-
-<md-title>Water Resources of Jordan: Present Status and Future Potentials</md-title>
-<md-date>1993</md-date>
-<md-author>Salameh, Elias and Bannayan, Helen</md-author>
-<md-description>18265046504</md-description>
-<md-medium>other</md-medium><location id="ocs-oaister.indexdata.com/solr/select" name="Oaister (SOLR)">
-<md-title>Water Resources of Jordan: Present Status and Future Potentials</md-title>
-<md-date>1993</md-date>
-<md-author>Salameh, Elias and Bannayan, Helen</md-author>
-<md-description>18265046504</md-description>
-<md-medium>other</md-medium></location>
-<relevance>26096</relevance>
-<recid>title water resources of jordan present status and future potentials author salameh elias and bannayan helen medium other</recid>
-</hit>
-<hit>
-
-<md-title>California water plan update</md-title>
-<md-date>1994</md-date>
-<md-description>Accompanied by: Executive summary. xi, [90] p. : col. ill. ; 28 cm</md-description>
-<md-medium>book</md-medium><location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>California water plan update</md-title>
-<md-date>1994</md-date>
-<md-description>Accompanied by: Executive summary. xi, [90] p. : col. ill. ; 28 cm</md-description>
-<md-description>&quot;November 1998.&quot;</md-description>
-<md-medium>book</md-medium></location>
-<location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>California water plan update</md-title>
-<md-date>1994</md-date>
-<md-description>&quot;October 1994.&quot;</md-description>
-<md-medium>book</md-medium></location>
-<count>2</count>
-<relevance>25693</relevance>
-<recid>title california water plan update medium book</recid>
-</hit>
-<hit>
-
-<md-title>Water quality and treatment;</md-title>
-<md-title-remainder>a handbook of community water supplies</md-title-remainder>
-<md-date>1971-1990</md-date>
-<md-description>First published in 1940 under title: Manual of water quality and treatment</md-description>
-<md-medium>book</md-medium><location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water quality and treatment;</md-title>
-<md-title-remainder>a handbook of public water supplies</md-title-remainder>
-<md-date>1971</md-date>
-<md-description>First published in 1940 under title: Manual of water quality and treatment</md-description>
-<md-medium>book</md-medium></location>
-<location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water quality and treatment</md-title>
-<md-title-remainder>a handbook of community water supplies</md-title-remainder>
-<md-date>1990</md-date>
-<md-medium>book</md-medium></location>
-<count>2</count>
-<relevance>23334</relevance>
-<recid>title water quality and treatment medium book</recid>
-</hit>
-<hit>
-
-<md-title>Water rights in Oregon</md-title>
-<md-title-remainder>an introduction to Oregon&apos;s water laws and water rights system</md-title-remainder>
-<md-date>1997-2002</md-date>
-<md-description>&quot;November 2002.&quot;</md-description>
-<md-medium>book</md-medium><location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water rights in Oregon</md-title>
-<md-title-remainder>an introduction to Oregon&apos;s water law and water rights system</md-title-remainder>
-<md-date>1997</md-date>
-<md-description>Cover title</md-description>
-<md-medium>book</md-medium></location>
-<location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water rights in Oregon</md-title>
-<md-title-remainder>an introduction to Oregon&apos;s water laws and water rights system</md-title-remainder>
-<md-date>2002</md-date>
-<md-description>Cover title</md-description>
-<md-description>&quot;November 2002.&quot;</md-description>
-<md-medium>book</md-medium></location>
-<count>2</count>
-<relevance>20884</relevance>
-<recid>title water rights in oregon medium book</recid>
-</hit>
-<hit>
-
-<md-title>Water</md-title>
-<md-title-remainder>a resource in crisis</md-title-remainder>
-<md-date>1991</md-date>
-<md-author>Lucas, Eileen</md-author>
-<md-description>Discusses how human activities and carelessness are polluting Earth&apos;s water supply and what must be done to clean it up</md-description>
-<md-medium>book</md-medium><location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water</md-title>
-<md-title-remainder>a resource in crisis</md-title-remainder>
-<md-date>1991</md-date>
-<md-author>Lucas, Eileen</md-author>
-<md-description>Discusses how human activities and carelessness are polluting Earth&apos;s water supply and what must be done to clean it up</md-description>
-<md-medium>book</md-medium></location>
-<relevance>20619</relevance>
-<recid>title water author lucas eileen medium book</recid>
-</hit>
-<hit>
-
-<md-title>Water wars</md-title>
-<md-title-remainder>the fight to control and conserve nature&apos;s most precious resource</md-title-remainder>
-<md-date>1993</md-date>
-<md-author>Cossi, Olga</md-author>
-<md-description>Discusses water&apos;s sources, uses, and shortages; water quality problems and management programs; and what individuals can do to ensure cleaner water</md-description>
-<md-medium>book</md-medium><location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water wars</md-title>
-<md-title-remainder>the fight to control and conserve nature&apos;s most precious resource</md-title-remainder>
-<md-date>1993</md-date>
-<md-author>Cossi, Olga</md-author>
-<md-description>&quot;An Earthcare book.&quot;</md-description>
-<md-description>Discusses water&apos;s sources, uses, and shortages; water quality problems and management programs; and what individuals can do to ensure cleaner water</md-description>
-<md-medium>book</md-medium></location>
-<relevance>20266</relevance>
-<recid>title water wars author cossi olga medium book</recid>
-</hit>
-<hit>
-
-<md-title>Water</md-title>
-<md-title-remainder>opposing viewpoints</md-title-remainder>
-<md-date>1994</md-date>
-<md-description>Presents opposing viewpoints on issues relating to water, including managing the water supply, acid rain, and government regulations</md-description>
-<md-medium>book</md-medium><location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water</md-title>
-<md-title-remainder>opposing viewpoints</md-title-remainder>
-<md-date>1994</md-date>
-<md-description>Presents opposing viewpoints on issues relating to water, including managing the water supply, acid rain, and government regulations</md-description>
-<md-medium>book</md-medium></location>
-<relevance>20151</relevance>
-<recid>title water medium book</recid>
-</hit>
-<hit>
-
-<md-title>Water</md-title>
-<md-title-remainder>the international crisis</md-title-remainder>
-<md-date>1991</md-date>
-<md-author>Clarke, Robin</md-author>
-<md-description>&quot;Published in association with the Swedish Red Cross.&quot;</md-description>
-<md-medium>book</md-medium><location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water</md-title>
-<md-title-remainder>the international crisis</md-title-remainder>
-<md-date>1991</md-date>
-<md-author>Clarke, Robin</md-author>
-<md-description>&quot;Published in association with the Swedish Red Cross.&quot;</md-description>
-<md-description>&quot;An Earthscan original&quot;--Cover</md-description>
-<md-medium>book</md-medium></location>
-<relevance>19647</relevance>
-<recid>title water author clarke robin medium book</recid>
-</hit>
-<hit>
-
-<md-title>Water quality standards</md-title>
-<md-date>1970-1973</md-date>
-<md-description>Errata slip inserted</md-description>
-<md-medium>book</md-medium><location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water quality standards</md-title>
-<md-date>1973</md-date>
-<md-medium>book</md-medium></location>
-<location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water quality standards</md-title>
-<md-date>1970</md-date>
-<md-description>Cover title</md-description>
-<md-description>Errata slip inserted</md-description>
-<md-medium>book</md-medium></location>
-<count>2</count>
-<relevance>19647</relevance>
-<recid>title water quality standards medium book</recid>
-</hit>
-<hit>
-
-<md-title>My Water Supply</md-title>
-<md-description>The Peggy Notebaert Nature Museum offers several online exhibits for kids, including the My Water Supply Web site geared towards students grade 6 through 12. The site&apos;s goal is to document drinking water sources throughout the world through individual stories and photographs by having kids investigate and submit information about their water resources. As the students investigate their areas&apos; water resources, it is hoped that they gain a deeper understanding of the water&apos;s importance and then will work towards water protection. Students can also view water supply information submitted by others in the growing database to compare and contrast others&apos; experiences. And, although the number of actual submittals is not yet extensive, as more classrooms contribute more students will learn the important lessons the site is trying to share</md-description>
-<md-medium>other</md-medium><location id="ocs-oaister.indexdata.com/solr/select" name="Oaister (SOLR)">
-<md-title>My Water Supply</md-title>
-<md-description>The Peggy Notebaert Nature Museum offers several online exhibits for kids, including the My Water Supply Web site geared towards students grade 6 through 12. The site&apos;s goal is to document drinking water sources throughout the world through individual stories and photographs by having kids investigate and submit information about their water resources. As the students investigate their areas&apos; water resources, it is hoped that they gain a deeper understanding of the water&apos;s importance and then will work towards water protection. Students can also view water supply information submitted by others in the growing database to compare and contrast others&apos; experiences. And, although the number of actual submittals is not yet extensive, as more classrooms contribute more students will learn the important lessons the site is trying to share</md-description>
-<md-medium>other</md-medium></location>
-<relevance>19138</relevance>
-<recid>title my water supply medium other</recid>
-</hit>
-<hit>
-
-<md-title>Water Quality: Microbial (Pathogen)</md-title>
-<md-description>The Safe Drinking Water Act (SDWA) and the Clean Water Acts (CWA) address microbial contamination of the nation&apos;s waters. The CWA enables protection of surface water for drinking water, recreational, and aquatic food source uses. The SDWA enables regulation of contamination of finished drinking water and protection of source waters</md-description>
-<md-medium>other</md-medium><location id="ocs-oaister.indexdata.com/solr/select" name="Oaister (SOLR)">
-<md-title>Water Quality: Microbial (Pathogen)</md-title>
-<md-description>The Safe Drinking Water Act (SDWA) and the Clean Water Acts (CWA) address microbial contamination of the nation&apos;s waters. The CWA enables protection of surface water for drinking water, recreational, and aquatic food source uses. The SDWA enables regulation of contamination of finished drinking water and protection of source waters</md-description>
-<md-medium>other</md-medium></location>
-<relevance>18580</relevance>
-<recid>title water quality microbial pathogen medium other</recid>
-</hit>
-<hit>
-
-<md-title>Water</md-title>
-<md-date>2003</md-date>
-<md-author>Kalz, Jill</md-author>
-<md-description>Briefly explains where our drinking water comes from and its importance in human nutrition</md-description>
-<md-medium>book</md-medium><location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water</md-title>
-<md-date>2003</md-date>
-<md-author>Kalz, Jill</md-author>
-<md-description>Briefly explains where our drinking water comes from and its importance in human nutrition</md-description>
-<md-medium>book</md-medium></location>
-<relevance>18460</relevance>
-<recid>title water author kalz jill medium book</recid>
-</hit>
-<hit>
-
-<md-title>Water</md-title>
-<md-date>1980</md-date>
-<md-author>Lewis, Alun</md-author>
-<md-description>Discusses water, which covers three-quarters of the earth&apos;s surface, as a source of energy</md-description>
-<md-medium>book</md-medium><location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water</md-title>
-<md-date>1980</md-date>
-<md-author>Lewis, Alun</md-author>
-<md-description>Includes index</md-description>
-<md-description>Discusses water, which covers three-quarters of the earth&apos;s surface, as a source of energy</md-description>
-<md-medium>book</md-medium></location>
-<relevance>18419</relevance>
-<recid>title water author lewis alun medium book</recid>
-</hit>
-<hit>
-
-<md-title>Water Basics</md-title>
-<md-description>Water is generally classified into two groups: Surface Water and Ground Water</md-description>
-<md-medium>other</md-medium><location id="ocs-oaister.indexdata.com/solr/select" name="Oaister (SOLR)">
-<md-title>Water Basics</md-title>
-<md-description>Water is generally classified into two groups: Surface Water and Ground Water</md-description>
-<md-medium>other</md-medium></location>
-<relevance>17758</relevance>
-<recid>title water basics medium other</recid>
-</hit>
-<hit>
-
-<md-title>Water quality data for Ontario lakes and streams</md-title>
-<md-date>1964</md-date>
-<md-author>Ontario Water Resources Commission; Ontario. Water Resources Branch; Ontario. Water Quality Branch</md-author>
-<md-description>Period covered by reports is irregular</md-description>
-<md-medium>other</md-medium><location id="ocs-oaister.indexdata.com/solr/select" name="Oaister (SOLR)">
-<md-title>Water quality data for Ontario lakes and streams</md-title>
-<md-date>1964</md-date>
-<md-author>Ontario Water Resources Commission; Ontario. Water Resources Branch; Ontario. Water Quality Branch</md-author>
-<md-description>Period covered by reports is irregular</md-description>
-<md-medium>other</md-medium></location>
-<location id="ocs-oaister.indexdata.com/solr/select" name="Oaister (SOLR)">
-<md-title>Water quality data for Ontario lakes and streams</md-title>
-<md-date>1964</md-date>
-<md-author>Ontario Water Resources Commission; Ontario. Water Resources Branch; Ontario. Water Quality Branch</md-author>
-<md-description>Period covered by reports is irregular</md-description>
-<md-medium>other</md-medium></location>
-<count>2</count>
-<relevance>17380</relevance>
-<recid>title water quality data for ontario lakes and streams author ontario water resources commission ontario water resources branch ontario water quality branch medium other</recid>
-</hit>
-<hit>
-
-<md-title>Appropriation of water in Montana</md-title>
-<md-date>1990-1992</md-date>
-<md-description>&quot;April 1992.&quot;</md-description>
-<md-medium>other</md-medium><location id="ocs-oaister.indexdata.com/solr/select" name="Oaister (SOLR)">
-<md-title>Appropriation of water in Montana</md-title>
-<md-date>1990</md-date>
-<md-description>&quot;July 1990.&quot;</md-description>
-<md-medium>other</md-medium></location>
-<location id="ocs-oaister.indexdata.com/solr/select" name="Oaister (SOLR)">
-<md-title>Appropriation of water in Montana</md-title>
-<md-date>1992</md-date>
-<md-description>&quot;April 1992.&quot;</md-description>
-<md-medium>other</md-medium></location>
-<count>2</count>
-<relevance>17229</relevance>
-<recid>title appropriation of water in montana medium other</recid>
-</hit>
-<hit>
-
-<md-title>Water quality assessment of the State Water Project, 1994-1995</md-title>
-<md-date>1997-2000</md-date>
-<md-description>&quot;September 1999.&quot;</md-description>
-<md-medium>book</md-medium><location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water quality assessment of the State Water Project, 1994-1995</md-title>
-<md-date>1997</md-date>
-<md-description>&quot;June 1997.&quot;</md-description>
-<md-medium>book</md-medium></location>
-<location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water quality assessment of the State Water Project, 1998-99</md-title>
-<md-date>2000</md-date>
-<md-description>Cover title</md-description>
-<md-description>&quot;July 2000.&quot;</md-description>
-<md-medium>book</md-medium></location>
-<location id="ocs-loc.indexdata.com/solr/select" name="LOC (SOLR)">
-<md-title>Water quality assessment of the State Water Project, 1996-97</md-title>
-<md-date>1999</md-date>
-<md-description>Cover title</md-description>
-<md-description>&quot;September 1999.&quot;</md-description>
-<md-medium>book</md-medium></location>
-<count>3</count>
-<relevance>17002</relevance>
-<recid>title water quality assessment of the state water project medium book</recid>
-</hit>
-<hit>
-
-<md-title>California water plan update : draft</md-title>
-<md-date>1993</md-date>
-<md-author>California. Dept. of Water Resources</md-author>
-<md-description>&quot;November 1993&quot;</md-description>
-<md-medium>other</md-medium><location id="ocs-oaister.indexdata.com/solr/select" name="Oaister (SOLR)">
-<md-title>California water plan update : draft</md-title>
-<md-date>1993</md-date>
-<md-author>California. Dept. of Water Resources</md-author>
-<md-description>&quot;November 1993&quot;</md-description>
-<md-medium>other</md-medium></location>
-<location id="ocs-oaister.indexdata.com/solr/select" name="Oaister (SOLR)">
-<md-title>California water plan update : draft</md-title>
-<md-date>1993</md-date>
-<md-author>California. Dept. of Water Resources</md-author>
-<md-description>&quot;November 1993&quot;</md-description>
-<md-medium>other</md-medium></location>
-<count>2</count>
-<relevance>16927</relevance>
-<recid>title california water plan update draft author california dept of water resources medium other</recid>
-</hit>
-</show>

diff --git a/test/test_solr_13.res b/test/test_solr_13.res
deleted file mode 100644 (file)
index 1dcf80c..0000000
--- a/test/test_solr_13.res
+++ /dev/null
@@ -1,78 +0,0 @@
-<termlist>
-<activeclients>0</activeclients>
-<list name="xtargets">
-<term>
-<id>ocs-oaister.indexdata.com/solr/select</id>
-<name>Oaister (SOLR)</name>
-<frequency>540499</frequency>
-<state>Client_Idle</state>
-<diagnostic>0</diagnostic>
-</term>
-<term>
-<id>ocs-loc.indexdata.com/solr/select</id>
-<name>LOC (SOLR)</name>
-<frequency>51829</frequency>
-<state>Client_Idle</state>
-<diagnostic>0</diagnostic>
-</term>
-</list>
-<list name="subject">
-<term><name>water</name><frequency>291373</frequency></term>
-<term><name>Temperature</name><frequency>284095</frequency></term>
-<term><name>Salinity</name><frequency>250727</frequency></term>
-<term><name>CTD/Rosette</name><frequency>235255</frequency></term>
-<term><name>Pressure</name><frequency>218869</frequency></term>
-<term><name>CTD</name><frequency>168792</frequency></term>
-<term><name>Oxygen</name><frequency>124141</frequency></term>
-<term><name>MEDAR/MEDATLAS</name><frequency>121785</frequency></term>
-<term><name>Mediterranean Data Archaeology and Rescue</name><frequency>121785</frequency></term>
-<term><name>WOCE</name><frequency>70319</frequency></term>
-<term><name>Water</name><frequency>6982</frequency></term>
-<term><name>Water-supply</name><frequency>5439</frequency></term>
-<term><name>Water resources development</name><frequency>4580</frequency></term>
-<term><name>Groundwater</name><frequency>3065</frequency></term>
-<term><name>Water quality</name><frequency>2536</frequency></term>
-</list>
-<list name="author">
-<term><name>MEDAR Group</name><frequency>119004</frequency></term>
-<term><name>WOCE Hydrographic Programme, WHP</name><frequency>38996</frequency></term>
-<term><name>Schröter, Jen</name><frequency>20168</frequency></term>
-<term><name>Seiß, G</name><frequency>20168</frequency></term>
-<term><name>Olbers, Dirk</name><frequency>20168</frequency></term>
-<term><name>Gouretski, Viktor V</name><frequency>20168</frequency></term>
-<term><name>WOCE Upper Ocean Thermal, UOT</name><frequency>17098</frequency></term>
-<term><name>Anonym</name><frequency>16955</frequency></term>
-<term><name>Victoria. State Rivers and Water Supply Commiss</name><frequency>9949</frequency></term>
-<term><name>BODC</name><frequency>7620</frequency></term>
-<term><name>Waters, Frank</name><frequency>50</frequency></term>
-<term><name>Van de Water, Frederic Franklyn</name><frequency>31</frequency></term>
-<term><name>Eliot, George</name><frequency>31</frequency></term>
-<term><name>Waters, John Frederick</name><frequency>29</frequency></term>
-<term><name>Waters, Clara Erskine Clement</name><frequency>29</frequency></term>
-</list>
-<list name="date">
-<term><name>2006</name><frequency>145562</frequency></term>
-<term><name>2005</name><frequency>95487</frequency></term>
-<term><name>2008</name><frequency>41399</frequency></term>
-<term><name>2007</name><frequency>39680</frequency></term>
-<term><name>2004</name><frequency>34617</frequency></term>
-<term><name>1992</name><frequency>21225</frequency></term>
-<term><name>2009</name><frequency>20604</frequency></term>
-<term><name>2003</name><frequency>18037</frequency></term>
-<term><name>2002</name><frequency>5176</frequency></term>
-<term><name>2001</name><frequency>3852</frequency></term>
-<term><name>1976</name><frequency>1301</frequency></term>
-<term><name>1996</name><frequency>1279</frequency></term>
-<term><name>1971</name><frequency>1275</frequency></term>
-<term><name>1977</name><frequency>1268</frequency></term>
-<term><name>1995</name><frequency>1246</frequency></term>
-</list>
-<list name="medium">
-<term><name>other</name><frequency>513559</frequency></term>
-<term><name>book</name><frequency>51781</frequency></term>
-<term><name>electronicresource</name><frequency>26940</frequency></term>
-<term><name>electron</name><frequency>125</frequency></term>
-<term><name>web</name><frequency>46</frequency></term>
-<term><name>microform</name><frequency>2</frequency></term>
-</list>
-</termlist>

diff --git a/test/test_solr_14.res b/test/test_solr_14.res
deleted file mode 100644 (file)
index 42534e3..0000000
--- a/test/test_solr_14.res
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings><status>OK</status></settings>
\ No newline at end of file

diff --git a/test/test_solr_15.res b/test/test_solr_15.res
deleted file mode 100644 (file)
index ab63fe6..0000000
--- a/test/test_solr_15.res
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<search><status>OK</status></search>
\ No newline at end of file

diff --git a/test/test_solr_16.res b/test/test_solr_16.res
deleted file mode 100644 (file)
index e08cbc5..0000000
--- a/test/test_solr_16.res
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<show>
-<status>OK</status>
-<activeclients>0</activeclients>
-<merged>0</merged>
-<total>592328</total>
-<start>0</start>
-<num>0</num>
-</show>

diff --git a/test/test_solr_17.res b/test/test_solr_17.res
deleted file mode 100644 (file)
index 1dcf80c..0000000
--- a/test/test_solr_17.res
+++ /dev/null
@@ -1,78 +0,0 @@
-<termlist>
-<activeclients>0</activeclients>
-<list name="xtargets">
-<term>
-<id>ocs-oaister.indexdata.com/solr/select</id>
-<name>Oaister (SOLR)</name>
-<frequency>540499</frequency>
-<state>Client_Idle</state>
-<diagnostic>0</diagnostic>
-</term>
-<term>
-<id>ocs-loc.indexdata.com/solr/select</id>
-<name>LOC (SOLR)</name>
-<frequency>51829</frequency>
-<state>Client_Idle</state>
-<diagnostic>0</diagnostic>
-</term>
-</list>
-<list name="subject">
-<term><name>water</name><frequency>291373</frequency></term>
-<term><name>Temperature</name><frequency>284095</frequency></term>
-<term><name>Salinity</name><frequency>250727</frequency></term>
-<term><name>CTD/Rosette</name><frequency>235255</frequency></term>
-<term><name>Pressure</name><frequency>218869</frequency></term>
-<term><name>CTD</name><frequency>168792</frequency></term>
-<term><name>Oxygen</name><frequency>124141</frequency></term>
-<term><name>MEDAR/MEDATLAS</name><frequency>121785</frequency></term>
-<term><name>Mediterranean Data Archaeology and Rescue</name><frequency>121785</frequency></term>
-<term><name>WOCE</name><frequency>70319</frequency></term>
-<term><name>Water</name><frequency>6982</frequency></term>
-<term><name>Water-supply</name><frequency>5439</frequency></term>
-<term><name>Water resources development</name><frequency>4580</frequency></term>
-<term><name>Groundwater</name><frequency>3065</frequency></term>
-<term><name>Water quality</name><frequency>2536</frequency></term>
-</list>
-<list name="author">
-<term><name>MEDAR Group</name><frequency>119004</frequency></term>
-<term><name>WOCE Hydrographic Programme, WHP</name><frequency>38996</frequency></term>
-<term><name>Schröter, Jen</name><frequency>20168</frequency></term>
-<term><name>Seiß, G</name><frequency>20168</frequency></term>
-<term><name>Olbers, Dirk</name><frequency>20168</frequency></term>
-<term><name>Gouretski, Viktor V</name><frequency>20168</frequency></term>
-<term><name>WOCE Upper Ocean Thermal, UOT</name><frequency>17098</frequency></term>
-<term><name>Anonym</name><frequency>16955</frequency></term>
-<term><name>Victoria. State Rivers and Water Supply Commiss</name><frequency>9949</frequency></term>
-<term><name>BODC</name><frequency>7620</frequency></term>
-<term><name>Waters, Frank</name><frequency>50</frequency></term>
-<term><name>Van de Water, Frederic Franklyn</name><frequency>31</frequency></term>
-<term><name>Eliot, George</name><frequency>31</frequency></term>
-<term><name>Waters, John Frederick</name><frequency>29</frequency></term>
-<term><name>Waters, Clara Erskine Clement</name><frequency>29</frequency></term>
-</list>
-<list name="date">
-<term><name>2006</name><frequency>145562</frequency></term>
-<term><name>2005</name><frequency>95487</frequency></term>
-<term><name>2008</name><frequency>41399</frequency></term>
-<term><name>2007</name><frequency>39680</frequency></term>
-<term><name>2004</name><frequency>34617</frequency></term>
-<term><name>1992</name><frequency>21225</frequency></term>
-<term><name>2009</name><frequency>20604</frequency></term>
-<term><name>2003</name><frequency>18037</frequency></term>
-<term><name>2002</name><frequency>5176</frequency></term>
-<term><name>2001</name><frequency>3852</frequency></term>
-<term><name>1976</name><frequency>1301</frequency></term>
-<term><name>1996</name><frequency>1279</frequency></term>
-<term><name>1971</name><frequency>1275</frequency></term>
-<term><name>1977</name><frequency>1268</frequency></term>
-<term><name>1995</name><frequency>1246</frequency></term>
-</list>
-<list name="medium">
-<term><name>other</name><frequency>513559</frequency></term>
-<term><name>book</name><frequency>51781</frequency></term>
-<term><name>electronicresource</name><frequency>26940</frequency></term>
-<term><name>electron</name><frequency>125</frequency></term>
-<term><name>web</name><frequency>46</frequency></term>
-<term><name>microform</name><frequency>2</frequency></term>
-</list>
-</termlist>

diff --git a/test/test_solr_4.res b/test/test_solr_4.res
index b98d670..a23d6e3 100644 (file)
--- a/test/test_solr_4.res
+++ b/test/test_solr_4.res
@@ -1,13 +1,314 @@
-<termlist>
+<?xml version="1.0" encoding="UTF-8"?>
+<show>
+<status>OK</status>
 <activeclients>0</activeclients>
-<list name="xtargets">
-</list>
-<list name="subject">
-</list>
-<list name="author">
-</list>
-<list name="date">
-</list>
-<list name="medium">
-</list>
-</termlist>
+<merged>97</merged>
+<total>1995</total>
+<start>0</start>
+<num>20</num>
+<hit>
+
+<md-title>Water</md-title>
+<md-date>1999</md-date>
+<md-author>De Villiers, Marq</md-author>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Water</md-title>
+<md-date>1999</md-date>
+<md-author>De Villiers, Marq</md-author>
+<md-medium>book</md-medium></location>
+<relevance>23233</relevance>
+<recid>title water author de villiers marq medium book</recid>
+</hit>
+<hit>
+
+<md-title>Potable water and methods of detecting impurities</md-title>
+<md-date>1899-1906</md-date>
+<md-author>Baker, M. N</md-author>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Potable water and methods of detecting impurities</md-title>
+<md-date>1906</md-date>
+<md-author>Baker, M. N</md-author>
+<md-medium>book</md-medium></location>
+<location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Potable water and methods of detecting impurities</md-title>
+<md-date>1899</md-date>
+<md-author>Baker, M. N</md-author>
+<md-medium>book</md-medium></location>
+<count>2</count>
+<relevance>21645</relevance>
+<recid>title potable water and methods of detecting impurities author baker m n medium book</recid>
+</hit>
+<hit>
+
+<md-title>Water</md-title>
+<md-date>2000</md-date>
+<md-author>Majeed, Abdul</md-author>
+<md-description>&quot;Balochistan conservation strategy background paper&quot;--T.p</md-description>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Water</md-title>
+<md-date>2000</md-date>
+<md-author>Majeed, Abdul</md-author>
+<md-description>&quot;Balochistan conservation strategy background paper&quot;--T.p</md-description>
+<md-medium>book</md-medium></location>
+<relevance>20202</relevance>
+<recid>title water author majeed abdul medium book</recid>
+</hit>
+<hit>
+
+<md-title>Water</md-title>
+<md-date>2000</md-date>
+<md-author>Grant, Pamela</md-author>
+<md-description>Examines major environmental issues surrounding water, giving examples of attempts to solve global problems and sources for more information</md-description>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Water</md-title>
+<md-date>2000</md-date>
+<md-author>Grant, Pamela</md-author>
+<md-description>Includes index</md-description>
+<md-description>Examines major environmental issues surrounding water, giving examples of attempts to solve global problems and sources for more information</md-description>
+<md-medium>book</md-medium></location>
+<relevance>18501</relevance>
+<recid>title water author grant pamela medium book</recid>
+</hit>
+<hit>
+
+<md-title>Water law</md-title>
+<md-date>2000</md-date>
+<md-author>Fisher, D. E</md-author>
+<md-description>Includes index</md-description>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Water law</md-title>
+<md-date>2000</md-date>
+<md-author>Fisher, D. E</md-author>
+<md-description>Includes index</md-description>
+<md-medium>book</md-medium></location>
+<relevance>18182</relevance>
+<recid>title water law author fisher d e medium book</recid>
+</hit>
+<hit>
+
+<md-title>A Primer on fresh water</md-title>
+<md-title-remainder>questions and answers</md-title-remainder>
+<md-date>2000</md-date>
+<md-description>Issued also in French under title: Notions élémentaires sur l&apos;eau douce : questions et réponses</md-description>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>A Primer on fresh water</md-title>
+<md-title-remainder>questions and answers</md-title-remainder>
+<md-date>2000</md-date>
+<md-description>Issued also in French under title: Notions élémentaires sur l&apos;eau douce : questions et réponses</md-description>
+<md-description>Includes index</md-description>
+<md-medium>book</md-medium></location>
+<relevance>17576</relevance>
+<recid>title a primer on fresh water medium book</recid>
+</hit>
+<hit>
+
+<md-title>Water and water supplies</md-title>
+<md-date>1901</md-date>
+<md-author>Thresh, John Clough</md-author>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Water and water supplies</md-title>
+<md-date>1901</md-date>
+<md-author>Thresh, John Clough</md-author>
+<md-medium>book</md-medium></location>
+<relevance>15152</relevance>
+<recid>title water and water supplies author thresh john clough medium book</recid>
+</hit>
+<hit>
+
+<md-title>Water quality assessment of the State Water Project, 1996-97</md-title>
+<md-date>1999-2000</md-date>
+<md-description>&quot;September 1999.&quot;</md-description>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Water quality assessment of the State Water Project, 1998-99</md-title>
+<md-date>2000</md-date>
+<md-description>Cover title</md-description>
+<md-description>&quot;July 2000.&quot;</md-description>
+<md-medium>book</md-medium></location>
+<location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Water quality assessment of the State Water Project, 1996-97</md-title>
+<md-date>1999</md-date>
+<md-description>Cover title</md-description>
+<md-description>&quot;September 1999.&quot;</md-description>
+<md-medium>book</md-medium></location>
+<count>2</count>
+<relevance>15152</relevance>
+<recid>title water quality assessment of the state water project medium book</recid>
+</hit>
+<hit>
+
+<md-title>Water-supply</md-title>
+<md-title-remainder>(Considered principally from a sanitary standpoint.)</md-title-remainder>
+<md-date>1896</md-date>
+<md-author>Mason, William Pitt</md-author>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Water-supply</md-title>
+<md-title-remainder>(Considered principally from a sanitary standpoint.)</md-title-remainder>
+<md-date>1896</md-date>
+<md-author>Mason, William Pitt</md-author>
+<md-medium>book</md-medium></location>
+<relevance>15152</relevance>
+<recid>title water supply author mason william pitt medium book</recid>
+</hit>
+<hit>
+
+<md-title>The law of waters and water rights</md-title>
+<md-title-remainder>international, national, state, municipal, and individual, including irrigation, drainage, and municipal water supply</md-title-remainder>
+<md-date>1904</md-date>
+<md-author>Farnham, Henry P</md-author>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>The law of waters and water rights</md-title>
+<md-title-remainder>international, national, state, municipal, and individual, including irrigation, drainage, and municipal water supply</md-title-remainder>
+<md-date>1904</md-date>
+<md-author>Farnham, Henry P</md-author>
+<md-medium>book</md-medium></location>
+<relevance>14630</relevance>
+<recid>title the law of waters and water rights author farnham henry p medium book</recid>
+</hit>
+<hit>
+
+<md-title>Water, in press, 1998</md-title>
+<md-title-remainder>an index of news items on water resources selected from leading news papers</md-title-remainder>
+<md-date>1998-1999</md-date>
+<md-description>With reference to India</md-description>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Water, in press, 1998</md-title>
+<md-title-remainder>an index to news items on water resources selected from leading news papers</md-title-remainder>
+<md-date>1999</md-date>
+<md-description>Includes index</md-description>
+<md-medium>book</md-medium></location>
+<location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Water in press, 1997</md-title>
+<md-title-remainder>an index of news items on water resources selected from leading news papers</md-title-remainder>
+<md-date>1998</md-date>
+<md-description>Includes index</md-description>
+<md-description>With reference to India</md-description>
+<md-medium>book</md-medium></location>
+<count>2</count>
+<relevance>13675</relevance>
+<recid>title water in press medium book</recid>
+</hit>
+<hit>
+
+<md-title>Regulations on the disposal of arsenic residuals from drinking water treatment plants</md-title>
+<md-date>2000</md-date>
+<md-description>&quot;EPA Contract 68-C7-0011, work assignment 0-38.&quot;</md-description>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Regulations on the disposal of arsenic residuals from drinking water treatment plants</md-title>
+<md-date>2000</md-date>
+<md-description>&quot;May 2000.&quot;</md-description>
+<md-description>&quot;EPA/600/R-00/025.&quot;</md-description>
+<md-description>&quot;EPA Contract 68-C7-0011, work assignment 0-38.&quot;</md-description>
+<md-medium>book</md-medium></location>
+<relevance>13636</relevance>
+<recid>title regulations on the disposal of arsenic residuals from drinking water treatment plants medium book</recid>
+</hit>
+<hit>
+
+<md-title>A guide to Montana water quality regulation</md-title>
+<md-date>1997</md-date>
+<md-author>Bryan, Michelle</md-author>
+<md-description>&quot;A joint publication of Legislative Environmental Policy Office, Environmental Quality Council [and] Montana University System, Water Center&quot;</md-description>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>A guide to Montana water quality regulation</md-title>
+<md-date>1997</md-date>
+<md-author>Bryan, Michelle</md-author>
+<md-description>&quot;A joint publication of Legislative Environmental Policy Office, Environmental Quality Council [and] Montana University System, Water Center&quot;</md-description>
+<md-medium>book</md-medium></location>
+<relevance>13199</relevance>
+<recid>title a guide to montana water quality regulation author bryan michelle medium book</recid>
+</hit>
+<hit>
+
+<md-title>Water technology management</md-title>
+<md-date>2001</md-date>
+<md-description>Collection of articles with reference to India</md-description>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Water technology management</md-title>
+<md-date>2001</md-date>
+<md-description>Collection of articles with reference to India</md-description>
+<md-medium>book</md-medium></location>
+<relevance>13131</relevance>
+<recid>title water technology management medium book</recid>
+</hit>
+<hit>
+
+<md-title>Methods of analysis by the U.S. Geological Survey National Water Quality Laboratory</md-title>
+<md-title-remainder>processing, taxonomy, and quality control of benthic macroinvertebrate samples</md-title-remainder>
+<md-date>2000</md-date>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Methods of analysis by the U.S. Geological Survey National Water Quality Laboratory</md-title>
+<md-title-remainder>processing, taxonomy, and quality control of benthic macroinvertebrate samples</md-title-remainder>
+<md-date>2000</md-date>
+<md-medium>book</md-medium></location>
+<relevance>13054</relevance>
+<recid>title methods of analysis by the u s geological survey national water quality laboratory medium book</recid>
+</hit>
+<hit>
+
+<md-title>Aquatic habitat indicators and their application to water quality objectives within the Clean Water Act</md-title>
+<md-date>1999</md-date>
+<md-author>Bauer, Steve</md-author>
+<md-description>&quot;This document was developed for US Environmental Protection Agency, Region 10, Seattle Washington, with the Idaho Water Resources Institute, University of Idaho.&quot;</md-description>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Aquatic habitat indicators and their application to water quality objectives within the Clean Water Act</md-title>
+<md-date>1999</md-date>
+<md-author>Bauer, Steve</md-author>
+<md-description>&quot;This document was developed for US Environmental Protection Agency, Region 10, Seattle Washington, with the Idaho Water Resources Institute, University of Idaho.&quot;</md-description>
+<md-medium>book</md-medium></location>
+<relevance>13016</relevance>
+<recid>title aquatic habitat indicators and their application to water quality objectives within the clean water act author bauer steve medium book</recid>
+</hit>
+<hit>
+
+<md-title>An empirical analysis of water temperature and dissolved oxygen conditions in the Red Deer River</md-title>
+<md-date>1997</md-date>
+<md-author>Saffran, Karen Anita</md-author>
+<md-description>&quot;March 1997.&quot;</md-description>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>An empirical analysis of water temperature and dissolved oxygen conditions in the Red Deer River</md-title>
+<md-date>1997</md-date>
+<md-author>Saffran, Karen Anita</md-author>
+<md-description>&quot;March 1997.&quot;</md-description>
+<md-medium>book</md-medium></location>
+<relevance>12929</relevance>
+<recid>title an empirical analysis of water temperature and dissolved oxygen conditions in the red deer river author saffran karen anita medium book</recid>
+</hit>
+<hit>
+
+<md-title>Surface water quality monitoring procedures manual</md-title>
+<md-date>1999</md-date>
+<md-description>&quot;GI-252&quot;--Cover</md-description>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Surface water quality monitoring procedures manual</md-title>
+<md-date>1999</md-date>
+<md-description>&quot;June 1999.&quot;</md-description>
+<md-description>&quot;GI-252&quot;--Cover</md-description>
+<md-medium>book</md-medium></location>
+<relevance>12626</relevance>
+<recid>title surface water quality monitoring procedures manual medium book</recid>
+</hit>
+<hit>
+
+<md-title>International Conference on Management of Drinking Water Resources, Chennai, December 3-5, 1997</md-title>
+<md-title-remainder>proceedings</md-title-remainder>
+<md-date>1997</md-date>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>International Conference on Management of Drinking Water Resources, Chennai, December 3-5, 1997</md-title>
+<md-title-remainder>proceedings</md-title-remainder>
+<md-date>1997</md-date>
+<md-medium>book</md-medium></location>
+<relevance>12323</relevance>
+<recid>title international conference on management of drinking water resources chennai december medium book</recid>
+</hit>
+<hit>
+
+<md-title>Mercados e instituciones de aguas en Bolivia</md-title>
+<md-date>1998</md-date>
+<md-medium>book</md-medium><location id="opencontent-solr:8989/solr/select" name="ocs_test">
+<md-title>Mercados e instituciones de aguas en Bolivia</md-title>
+<md-date>1998</md-date>
+<md-medium>book</md-medium></location>
+<relevance>12121</relevance>
+<recid>title mercados e instituciones de aguas en bolivia medium book</recid>
+</hit>
+</show>

diff --git a/test/test_solr_5.res b/test/test_solr_5.res
index d3b889f..d2c7eaf 100644 (file)
--- a/test/test_solr_5.res
+++ b/test/test_solr_5.res
@@ -1,9 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<show>
-<status>OK</status>
+<termlist>
 <activeclients>0</activeclients>
-<merged>0</merged>
-<total>0</total>
-<start>0</start>
-<num>0</num>
-</show>
+<list name="xtargets">
+<term>
+<id>opencontent-solr:8989/solr/select</id>
+<name>ocs_test</name>
+<frequency>1995</frequency>
+<state>Client_Idle</state>
+<diagnostic>0</diagnostic>
+</term>
+</list>
+<list name="subject">
+<term><name>Water-supply</name><frequency>44</frequency></term>
+<term><name>Water</name><frequency>34</frequency></term>
+<term><name>Water resources development</name><frequency>24</frequency></term>
+<term><name>Water quality</name><frequency>15</frequency></term>
+<term><name>Water quality management</name><frequency>11</frequency></term>
+<term><name>Water conservation</name><frequency>9</frequency></term>
+<term><name>Drinking water</name><frequency>7</frequency></term>
+<term><name>Water use</name><frequency>6</frequency></term>
+<term><name>Water rights</name><frequency>6</frequency></term>
+<term><name>Groundwater</name><frequency>4</frequency></term>
+<term><name>Hydrology</name><frequency>3</frequency></term>
+<term><name>Water supply</name><frequency>3</frequency></term>
+<term><name>Rural</name><frequency>3</frequency></term>
+<term><name>Water-supply engineering</name><frequency>3</frequency></term>
+<term><name>Water harvesting</name><frequency>3</frequency></term>
+</list>
+<list name="author">
+<term><name>Baker, M. N</name><frequency>2</frequency></term>
+<term><name>Hochschwender, Ted</name><frequency>1</frequency></term>
+<term><name>Davis, Floyd</name><frequency>1</frequency></term>
+<term><name>De Villiers, Marq</name><frequency>1</frequency></term>
+<term><name>Majeed, Abdul</name><frequency>1</frequency></term>
+<term><name>Fisher, D. E</name><frequency>1</frequency></term>
+<term><name>Thresh, John Clough</name><frequency>1</frequency></term>
+<term><name>Glover, David</name><frequency>1</frequency></term>
+<term><name>Frey, Hans</name><frequency>1</frequency></term>
+<term><name>Ravi, Rājeśa</name><frequency>1</frequency></term>
+<term><name>Sherk, George William</name><frequency>1</frequency></term>
+<term><name>Faeth, Paul</name><frequency>1</frequency></term>
+<term><name>Bryan, Michelle</name><frequency>1</frequency></term>
+<term><name>Powell, J. M</name><frequency>1</frequency></term>
+<term><name>Shade, Patricia J</name><frequency>1</frequency></term>
+</list>
+<list name="date">
+<term><name>2000</name><frequency>32</frequency></term>
+<term><name>1999</name><frequency>29</frequency></term>
+<term><name>1998</name><frequency>6</frequency></term>
+<term><name>1997</name><frequency>4</frequency></term>
+<term><name>2001</name><frequency>3</frequency></term>
+<term><name>1996</name><frequency>3</frequency></term>
+<term><name>1897</name><frequency>2</frequency></term>
+<term><name>1898</name><frequency>2</frequency></term>
+<term><name>1899</name><frequency>2</frequency></term>
+<term><name>1903</name><frequency>2</frequency></term>
+<term><name>1896</name><frequency>2</frequency></term>
+<term><name>1891</name><frequency>1</frequency></term>
+<term><name>1901</name><frequency>1</frequency></term>
+<term><name>1855</name><frequency>1</frequency></term>
+<term><name>1904</name><frequency>1</frequency></term>
+</list>
+<list name="medium">
+<term><name>book</name><frequency>99</frequency></term>
+<term><name>book (electronic)</name><frequency>1</frequency></term>
+</list>
+</termlist>

diff --git a/test/test_solr_6.res b/test/test_solr_6.res
deleted file mode 100644 (file)
index ab63fe6..0000000
--- a/test/test_solr_6.res
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<search><status>OK</status></search>
\ No newline at end of file

diff --git a/test/test_solr_7.res b/test/test_solr_7.res
deleted file mode 100644 (file)
index d3b889f..0000000
--- a/test/test_solr_7.res
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<show>
-<status>OK</status>
-<activeclients>0</activeclients>
-<merged>0</merged>
-<total>0</total>
-<start>0</start>
-<num>0</num>
-</show>

diff --git a/test/test_solr_8.res b/test/test_solr_8.res
deleted file mode 100644 (file)
index b98d670..0000000
--- a/test/test_solr_8.res
+++ /dev/null
@@ -1,13 +0,0 @@
-<termlist>
-<activeclients>0</activeclients>
-<list name="xtargets">
-</list>
-<list name="subject">
-</list>
-<list name="author">
-</list>
-<list name="date">
-</list>
-<list name="medium">
-</list>
-</termlist>

diff --git a/test/test_solr_9.res b/test/test_solr_9.res
deleted file mode 100644 (file)
index b98d670..0000000
--- a/test/test_solr_9.res
+++ /dev/null
@@ -1,13 +0,0 @@
-<termlist>
-<activeclients>0</activeclients>
-<list name="xtargets">
-</list>
-<list name="subject">
-</list>
-<list name="author">
-</list>
-<list name="date">
-</list>
-<list name="medium">
-</list>
-</termlist>