Merge branch 'master' into paz-927

author Adam Dickmeiss <adam@indexdata.dk>

Fri, 6 Mar 2015 10:17:31 +0000 (11:17 +0100)

committer Adam Dickmeiss <adam@indexdata.dk>

Fri, 6 Mar 2015 10:17:31 +0000 (11:17 +0100)
author Adam Dickmeiss <adam@indexdata.dk>
Fri, 6 Mar 2015 10:17:31 +0000 (11:17 +0100)
committer Adam Dickmeiss <adam@indexdata.dk>
Fri, 6 Mar 2015 10:17:31 +0000 (11:17 +0100)
diff --git a/IDMETA b/IDMETA

index d6e7ac5..8e7ad7a 100644 (file)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
  DEBIAN_DIST="jessie wheezy squeeze"
  UBUNTU_DIST="utopic trusty saucy precise"
  CENTOS_DIST="centos5 centos6"
-VERSION=1.8.5
+VERSION=1.8.6
diff --git a/LICENSE b/LICENSE

index e2fcfcc..2dda352 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
  LICENSE file of Pazpar2.
-Copyright (C) 2006-2014 Index Data.
+Copyright (C) 2006-2015 Index Data.
  
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
diff --git a/NEWS b/NEWS

index 9e5e6c2..084446b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+--- 1.8.6 2015/02/10
+
+Increase facet limit PAZ-990
+No longer a limit on facets.
+
+Pazpar2-js no longer requires Apache2 PAZ-989
+Package pazpar2-apache2 sets up everything WRT apache and only
+package which requires it. pazpar2-apache depends on pazpar2-js.
+
  --- 1.8.5 2014/12/17
  
  Larger string buffer for forward address PAZ-987
diff --git a/README b/README

index 4baf775..f3eeb74 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Pazpar2 is a high-performance, user interface-independent, data
  model-independent metasearching middleware featuring merging, relevance
  ranking, record sorting, and faceted results.
  
-Copyright (C) 2006-2014 Index Data. See the file LICENSE for details.
+Copyright (C) 2006-2015 Index Data. See the file LICENSE for details.
  
  Installation instructions and documentation is found in directory 'doc' and
  on-line at http://www.indexdata.com/pazpar2/ .
diff --git a/debian/control b/debian/control

index 507358c..c50b234 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,6 @@ Description: debugging symbols for Pazpar2
  
  Package: pazpar2-js
  Architecture: all
-Depends: apache2.2-common
  Description: Java Script utilities
   Pazpar2 is a high-performance, user interface-independent, data
   model-independent metasearching middleware featuring merging, relevance
@@ -65,7 +64,7 @@ Description: Documentation for Pazpar2 metasearcher
  
  Package: pazpar2-apache2
  Architecture: all
-Depends: pazpar2, apache2
+Depends: pazpar2, apache2, pazpar2-js
  Description: Apache2 configuration for Pazpar2
   Pazpar2 is a high-performance, user interface-independent, data
   model-independent metasearching middleware featuring merging, relevance
@@ -76,7 +75,7 @@ Description: Apache2 configuration for Pazpar2
  
  Package: pazpar2-test1
  Architecture: all
-Depends: pazpar2-apache2, pazpar2-js
+Depends: pazpar2-apache2
  Description: Pazpar2 portal test1
   Pazpar2 is a high-performance, user interface-independent, data
   model-independent metasearching middleware featuring merging, relevance
@@ -88,7 +87,7 @@ Description: Pazpar2 portal test1
  
  Package: pazpar2-jsdemo
  Architecture: all
-Depends: pazpar2-apache2, pazpar2-js
+Depends: pazpar2-apache2
  Description: Pazpar2 demo using the pz2.js library
   Pazpar2 is a high-performance, user interface-independent, data
   model-independent metasearching middleware featuring merging, relevance
diff --git a/debian/pazpar2-apache2.postinst b/debian/pazpar2-apache2.postinst

index 6c4f18b..29a837a 100644 (file)
--- a/debian/pazpar2-apache2.postinst
+++ b/debian/pazpar2-apache2.postinst
@@ -15,6 +15,10 @@ reload_apache()
  }
  
  if [ -e /etc/apache2/apache2.conf ]; then
+    if [ -d /etc/apache2/conf.d ]; then
+       ln -sf /etc/pazpar2/ap2pazpar2-js.cfg /etc/apache2/conf.d/pazpar2-js
+    fi
+
      if [ ! -f /etc/apache2/mods-enabled/proxy_http.load ]; then
         a2enmod proxy_http || true
      fi
diff --git a/debian/pazpar2-js.postinst b/debian/pazpar2-js.postinst

deleted file mode 100644 (file)

index 2e91299..0000000
--- a/debian/pazpar2-js.postinst
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" != "configure" ]; then
-    exit 0
-fi
-
-reload_apache()
-{
-    if apache2ctl configtest 2>/dev/null; then
-       invoke-rc.d apache2 force-reload || true
-    else
-       echo "Your apache2 configuration is broken, so we're not restarting it for you."
-    fi
-}
-
-if [ -e /etc/apache2/apache2.conf ]; then
-    if [ -d /etc/apache2/conf.d ]; then
-       ln -sf /etc/pazpar2/ap2pazpar2-js.cfg /etc/apache2/conf.d/pazpar2-js
-    fi
-    
-    reload_apache
-fi
-exit 0
diff --git a/debian/pazpar2-js.postrm b/debian/pazpar2-js.postrm

deleted file mode 100644 (file)

index cbfc288..0000000
--- a/debian/pazpar2-js.postrm
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-    purge|remove)
-        WEBSERVERS="apache2"
-        for apache in $WEBSERVERS; do
-            if [ -f "/etc/$apache/conf.d/pazpar2-js" ]; then
-                echo "Removing pazpar2-js configuration file for $apache.."
-                rm -f /etc/$apache/conf.d/pazpar2-js
-                if [ -f "/var/run/$apache.pid" ]; then
-                    invoke-rc.d $apache reload
-                fi
-            fi
-        done
-        ;;
-    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-esac
-
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/doc/entities.ent b/doc/entities.ent

index d0b5e1c..f6385e3 100644 (file)
--- a/doc/entities.ent
+++ b/doc/entities.ent
@@ -1,5 +1,5 @@
  <!-- Manually edited stuff used for all package documentation -->
-<!ENTITY copyright-year "2006-2014">
+<!ENTITY copyright-year "2006-2015">
  <!ENTITY manref SYSTEM "manref.xml">
  <!ENTITY sect-ajaxdev SYSTEM "ajaxdev.xml">
  <!ENTITY gpl2 SYSTEM "gpl-2.0.xml">
diff --git a/doc/pazpar2_conf.xml b/doc/pazpar2_conf.xml

index 08b5a68..8d64acc 100644 (file)
--- a/doc/pazpar2_conf.xml
+++ b/doc/pazpar2_conf.xml
@@ -262,6 +262,11 @@
              articles), and 'no' (no sorting). The default value is
              'no'.
             </para>
+           <para>
+            When 'skiparticle' is used, some common articles from the
+            English and German languages are ignored. At present the
+            list is: 'the', 'den', 'der', 'die', 'des', 'an', 'a'.
+           </para>
            </listitem>
           </varlistentry>
  
@@ -1446,16 +1451,17 @@
       <listitem>
        <para>
         Specifies that a target is preferred, e.g. possible local, faster
-       target. Using block=pref on show command will wait for all these
+       target. Using block=preferred on <link linkend="command-show">
+       show command</link> will wait for all these
         targets to return records before releasing the block.
-       If no target is preferred, the block=pref will identical to block=1,
-       which release when one target has returned records.
+       If no target is preferred, the block=preferred will identical to
+       block=1, which release when one target has returned records.
        </para>
       </listitem>
      </varlistentry>
  
      <varlistentry>
-     <term>pz:presentchunk</term>
+     <term>pz:present_chunk</term>
       <listitem>
        <para>
         Controls the chunk size in present requests. Pazpar2 will
diff --git a/doc/pazpar2_protocol.xml b/doc/pazpar2_protocol.xml

index 7540224..4629cbf 100644 (file)
--- a/doc/pazpar2_protocol.xml
+++ b/doc/pazpar2_protocol.xml
@@ -429,6 +429,11 @@ search.pz2?session=2044502273&command=stat
         ready to display. Use this to show first records rapidly without
         requiring rapid polling.
         </para>
+       <para>
+       If block is set to <literal>preferred</literal>, the command will
+       wait until records have been received from all databases with preferred
+       setting
+       </para>
        </listitem>
       </varlistentry>
  
diff --git a/src/session.c b/src/session.c

index 39dfb90..abc53c7 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -204,29 +204,18 @@ void add_facet(struct session *s, const char *type, const char *value, int count
  
      if (wrbuf_len(facet_wrbuf))
      {
-        int i;
-        for (i = 0; i < s->num_termlists; i++)
-            if (!strcmp(s->termlists[i].name, type))
+        struct named_termlist **tp = &s->termlists;
+        for (; (*tp); tp = &(*tp)->next)
+            if (!strcmp((*tp)->name, type))
                  break;
-        if (i == s->num_termlists)
+        if (!*tp)
          {
-            if (i == SESSION_MAX_TERMLISTS)
-            {
-                session_log(s, YLOG_FATAL, "Too many termlists");
-                wrbuf_destroy(facet_wrbuf);
-                wrbuf_destroy(display_wrbuf);
-                return;
-            }
-
-            s->termlists[i].name = nmem_strdup(s->nmem, type);
-            s->termlists[i].termlist = termlist_create(s->nmem);
-            s->num_termlists = i + 1;
+            *tp = nmem_malloc(s->nmem, sizeof(**tp));
+            (*tp)->name = nmem_strdup(s->nmem, type);
+            (*tp)->termlist = termlist_create(s->nmem);
+            (*tp)->next = 0;
          }
-
-#if 0
-        session_log(s, YLOG_LOG, "Facets for %s: %s norm:%s (%d)", type, value, wrbuf_cstr(facet_wrbuf), count);
-#endif
-        termlist_insert(s->termlists[i].termlist, wrbuf_cstr(display_wrbuf),
+        termlist_insert((*tp)->termlist, wrbuf_cstr(display_wrbuf),
                          wrbuf_cstr(facet_wrbuf), count);
      }
      wrbuf_destroy(facet_wrbuf);
@@ -604,8 +593,7 @@ static void session_clear_set(struct session *se, struct reclist_sortparms *sp)
                      nmem_total(se->nmem));
      nmem_reset(se->nmem);
      se->total_records = se->total_merged = 0;
-    se->num_termlists = 0;
-
+    se->termlists = 0;
      relevance_clear(se->relevance);
  
      /* reset list of sorted results and clear to relevance search */
@@ -1025,7 +1013,7 @@ struct session *new_session(NMEM nmem, struct conf_service *service,
      session->total_records = 0;
      session->number_of_warnings_unknown_elements = 0;
      session->number_of_warnings_unknown_metadata = 0;
-    session->num_termlists = 0;
+    session->termlists = 0;
      session->reclist = reclist_create(nmem);
      session->clients_active = 0;
      session->clients_cached = 0;
@@ -1191,9 +1179,10 @@ void perform_termlist(struct http_channel *c, struct session *se,
          const char *tname;
          int must_generate_empty = 1; /* bug 5350 */
  
-        for (i = 0; i < se->num_termlists; i++)
+        struct named_termlist *t = se->termlists;
+        for (; t; t = t->next)
          {
-            tname = se->termlists[i].name;
+            tname = t->name;
              if (!strcmp(names[j], tname) || !strcmp(names[j], "*"))
              {
                  struct termlist_score **p = 0;
@@ -1204,8 +1193,7 @@ void perform_termlist(struct http_channel *c, struct session *se,
                  wrbuf_puts(c->wrbuf, "\">\n");
                  must_generate_empty = 0;
  
-                p = termlist_highscore(se->termlists[i].termlist, &len,
-                                       nmem_tmp);
+                p = termlist_highscore(t->termlist, &len, nmem_tmp);
                  if (p)
                  {
                      int i;
diff --git a/src/session.h b/src/session.h

index ecc5549..f106c48 100644 (file)
--- a/src/session.h
+++ b/src/session.h
@@ -71,14 +71,13 @@ struct session_database
  #define SESSION_WATCH_BYTARGET  4
  #define SESSION_WATCH_MAX       4
  
-#define SESSION_MAX_TERMLISTS 10
-
  typedef void (*session_watchfun)(void *data);
  
  struct named_termlist
  {
      char *name;
      struct termlist *termlist;
+    struct named_termlist *next;
  };
  
  struct session_watchentry {
@@ -97,8 +96,7 @@ struct session {
      struct client_list *clients_cached; // Clients in cache
      NMEM session_nmem;  // Nmem for session-permanent storage
      NMEM nmem;          // Nmem for each operation (i.e. search, result set, etc)
-    int num_termlists;
-    struct named_termlist termlists[SESSION_MAX_TERMLISTS];
+    struct named_termlist *termlists;
      struct relevance *relevance;
      struct reclist *reclist;
      char *mergekey;
diff --git a/test/test-solr.xml b/test/test-solr.xml

deleted file mode 100644 (file)

index e61a1e6..0000000
--- a/test/test-solr.xml
+++ /dev/null
@@ -1,1924 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<response>
-  <lst name="responseHeader">
-    <int name="status">0</int>
-    <int name="QTime">62</int>
-    <lst name="params">
-      <str name="facet">true</str>
-      <str name="fl">*,score</str>
-      <str name="facet.mincount">1</str>
-      <str name="start">20</str>
-      <str name="q">text:water</str>
-      <arr name="facet.field">
-        <str>date</str>
-        <str>medium_exact</str>
-        <str>subject_exact</str>
-        <str>author_exact</str>
-      </arr>
-      <str name="rows">20</str>
-    </lst>
-  </lst>
-  <result name="response" numFound="1995" start="20" maxScore="2.3047338">
-    <doc>
-      <float name="score">1.9282786</float>
-      <str name="author">Ravi, Rājeśa.</str>
-      <str name="author-date"/>
-      <str name="author-title"/>
-      <arr name="date">
-        <str>1999</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1999</str>
-      </arr>
-      <arr name="description">
-        <str>On the effort of conserving rain water for drinking and harvesting; case study of selected villages in Rajasthan, India.</str>
-      </arr>
-      <arr name="edition">
-        <str>1. saṃskaraṇa.</str>
-      </arr>
-      <str name="id">   00371304 </str>
-      <str name="id_exact">   00371304 </str>
-      <arr name="lccn">
-        <str>   00371304 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>22 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>60 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>ill. ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>1999.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>Taruṇa Bhārata Saṅgha,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Alavara :</str>
-      </arr>
-      <arr name="subject">
-        <str>Water harvesting</str>
-        <str>Rain-water</str>
-        <str>Water-supply</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water harvesting, India, Rajasthan.</str>
-        <str>Rain-water (Water-supply), India, Rajasthan.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water harvesting</str>
-        <str>Rain-water</str>
-        <str>Water-supply</str>
-      </arr>
-      <str name="title">Pahāṛa para pānī /</str>
-      <str name="title-complete">Pahāṛa para pānī /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder"/>
-      <str name="title-responsibility">Rājeśa Ravi, Jineśa Jaina.</str>
-    </doc>
-    <doc>
-      <float name="score">1.9282786</float>
-      <arr name="date">
-        <str>1999</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1999</str>
-      </arr>
-      <str name="id">   00394954 </str>
-      <str name="id_exact">   00394954 </str>
-      <arr name="isbn">
-        <str>9521105534</str>
-      </arr>
-      <arr name="lccn">
-        <str>   00394954 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>30 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>43 p. ;</str>
-      </arr>
-      <arr name="physical-format">
-        <str/>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>1999.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>Edita,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Helsinki :</str>
-      </arr>
-      <arr name="subject">
-        <str>Water quality management</str>
-        <str>Nutrient pollution of water</str>
-        <str>Eutrophication</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water quality management, Finland.</str>
-        <str>Water quality management, Government policy, Finland.</str>
-        <str>Nutrient pollution of water, Finland.</str>
-        <str>Eutrophication, Control, Finland.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water quality management</str>
-        <str>Nutrient pollution of water</str>
-        <str>Eutrophication</str>
-      </arr>
-      <str name="title">Water protection targets for the year 2005.</str>
-      <str name="title-complete">Water protection targets for the year 2005.</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder"/>
-      <str name="title-responsibility"/>
-      <str name="title-uniform">Målen för skydd av vattnen fram till år 2005.</str>
-      <str name="title-uniform-key"/>
-      <str name="title-uniform-media"/>
-      <str name="title-uniform-partname"/>
-      <str name="title-uniform-parts"/>
-    </doc>
-    <doc>
-      <float name="score">1.9282786</float>
-      <arr name="date">
-        <str>1998</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1998</str>
-      </arr>
-      <str name="id">   00410461 </str>
-      <str name="id_exact">   00410461 </str>
-      <arr name="isbn">
-        <str>9290903589</str>
-      </arr>
-      <arr name="lccn">
-        <str>   00410461 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>28 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>v, 32 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>ill., map ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>c1998.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>International Water Management Institute,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Colombo, Sri Lanka :</str>
-      </arr>
-      <arr name="series-title">
-        <str>SWIM paper,</str>
-      </arr>
-      <arr name="subject">
-        <str>Water resources development</str>
-        <str>Water use</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water resources development.</str>
-        <str>Water use.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water resources development</str>
-        <str>Water use</str>
-      </arr>
-      <str name="title">Improving water utilization from a catchment perspective</str>
-      <str name="title-complete">Improving water utilization from a catchment perspective</str>
-      <str name="title-dates"/>
-      <str name="title-medium">[microform] /</str>
-      <str name="title-number-section"/>
-      <str name="title-remainder"/>
-      <str name="title-responsibility">Charles Batchelor ... [et al.].</str>
-    </doc>
-    <doc>
-      <float name="score">1.9282786</float>
-      <arr name="date">
-        <str>1999</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1999</str>
-      </arr>
-      <str name="id">   00410463 </str>
-      <str name="id_exact">   00410463 </str>
-      <arr name="isbn">
-        <str>9290903767</str>
-      </arr>
-      <arr name="lccn">
-        <str>   00410463 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>28 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>ix, 59 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>ill. ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>c1999.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>International Water Management Institute,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Colombo, Sri Lanka :</str>
-      </arr>
-      <arr name="series-title">
-        <str>SWIM paper,</str>
-      </arr>
-      <arr name="subject">
-        <str>Water resources development</str>
-        <str>Water quality management</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water resources development.</str>
-        <str>Water quality management.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water resources development</str>
-        <str>Water quality management</str>
-      </arr>
-      <str name="title">Modeling water resources management at the basin level</str>
-      <str name="title-complete">Modeling water resources management at the basin level review and future directions /</str>
-      <str name="title-dates"/>
-      <str name="title-medium">[microform] :</str>
-      <str name="title-number-section"/>
-      <str name="title-remainder">review and future directions /</str>
-      <str name="title-responsibility">Daene C. McKinney ... [et al.].</str>
-    </doc>
-    <doc>
-      <float name="score">1.9282786</float>
-      <str name="corporate-date"/>
-      <str name="corporate-location"/>
-      <str name="corporate-name">Boston Water Power Company.</str>
-      <arr name="date">
-        <str>1855</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1855</str>
-      </arr>
-      <str name="id">   00537021 </str>
-      <str name="id_exact">   00537021 </str>
-      <arr name="lccn">
-        <str>   00537021 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>23 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>24 p. ;</str>
-      </arr>
-      <arr name="physical-format">
-        <str/>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>1855.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>Printed by Dutton and Wentworth,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Boston :</str>
-      </arr>
-      <arr name="subject">
-        <str>Boston Water Power Company</str>
-        <str>Water-power</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Boston Water Power Company.</str>
-        <str>Water-power, Massachusetts, Boston.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Boston Water Power Company</str>
-        <str>Water-power</str>
-      </arr>
-      <str name="title">Report of the directors of the Boston Water-Power Company to its stockholders, April 24, 1855.</str>
-      <str name="title-complete">Report of the directors of the Boston Water-Power Company to its stockholders, April 24, 1855.</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder"/>
-      <str name="title-responsibility"/>
-    </doc>
-    <doc>
-      <float name="score">1.9131546</float>
-      <str name="author">Sherk, George William.</str>
-      <str name="author-date"/>
-      <str name="author-title"/>
-      <arr name="date">
-        <str>2000</str>
-      </arr>
-      <arr name="date_exact">
-        <str>2000</str>
-      </arr>
-      <arr name="description">
-        <str>Includes index.</str>
-      </arr>
-      <str name="id">   00059311 </str>
-      <str name="id_exact">   00059311 </str>
-      <arr name="isbn">
-        <str>9041198199 (hardcover : alk. paper)</str>
-      </arr>
-      <arr name="lccn">
-        <str>   00059311 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str/>
-      </arr>
-      <arr name="physical-extent">
-        <str>p. cm.</str>
-      </arr>
-      <arr name="physical-format">
-        <str/>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>2000.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>Kluwer Law International,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Boston, MA :</str>
-      </arr>
-      <arr name="series-title">
-        <str>International and national water law and policy series ;</str>
-      </arr>
-      <arr name="subject">
-        <str>Water rights</str>
-        <str>Water resources development</str>
-        <str>Interstate agreements</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water rights, United States.</str>
-        <str>Water resources development, Law and legislation, United States.</str>
-        <str>Interstate agreements, United States.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water rights</str>
-        <str>Water resources development</str>
-        <str>Interstate agreements</str>
-      </arr>
-      <str name="title">Dividing the waters :</str>
-      <str name="title-complete">Dividing the waters : the resolution of interstate water conflicts in the United States /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder">the resolution of interstate water conflicts in the United States /</str>
-      <str name="title-responsibility">by George William Sherk.</str>
-    </doc>
-    <doc>
-      <float name="score">1.9131546</float>
-      <str name="author">Faeth, Paul.</str>
-      <str name="author-date"/>
-      <str name="author-title"/>
-      <arr name="date">
-        <str>2000</str>
-      </arr>
-      <arr name="date_exact">
-        <str>2000</str>
-      </arr>
-      <str name="id">   00104473 </str>
-      <str name="id_exact">   00104473 </str>
-      <arr name="isbn">
-        <str>1569731977</str>
-      </arr>
-      <arr name="lccn">
-        <str>   00104473 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>26 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>viii, 50 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>ill., map ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>2000.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>World Resources Institute,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Washington, DC :</str>
-      </arr>
-      <arr name="subject">
-        <str>Nutrient pollution of water</str>
-        <str>Water quality management</str>
-        <str>Water</str>
-        <str>Agricultural pollution</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Nutrient pollution of water, United States.</str>
-        <str>Water quality management, United States.</str>
-        <str>Water, Pollution, Environmental aspects, United States.</str>
-        <str>Water, Pollution, United States, Prevention.</str>
-        <str>Agricultural pollution, United States.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Nutrient pollution of water</str>
-        <str>Water quality management</str>
-        <str>Water</str>
-        <str>Agricultural pollution</str>
-      </arr>
-      <str name="title">Fertile ground :</str>
-      <str name="title-complete">Fertile ground : nutrient trading's potential to cost-effectively improve water quality /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder">nutrient trading's potential to cost-effectively improve water quality /</str>
-      <str name="title-responsibility">Paul Faeth.</str>
-    </doc>
-    <doc>
-      <float name="score">1.9131546</float>
-      <arr name="date">
-        <str>1999</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1999</str>
-      </arr>
-      <str name="id">   00265121 </str>
-      <str name="id_exact">   00265121 </str>
-      <arr name="isbn">
-        <str>1853126853</str>
-      </arr>
-      <arr name="lccn">
-        <str>   00265121 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>24 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>588 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>ill., maps ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>c1999.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>WIT Press,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Southampton, UK ;</str>
-      </arr>
-      <arr name="series-title">
-        <str>International series on progress in water resources,</str>
-      </arr>
-      <arr name="subject">
-        <str>Water</str>
-        <str>Water quality management</str>
-        <str>Sewage</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water, Pollution, Congresses.</str>
-        <str>Water, Pollution, Mathematical models, Congresses.</str>
-        <str>Water, Pollution, Measurement, Congresses.</str>
-        <str>Water quality management, Congresses.</str>
-        <str>Sewage, Purification, Congresses.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water</str>
-        <str>Water quality management</str>
-        <str>Sewage</str>
-      </arr>
-      <str name="title">Water pollution V :</str>
-      <str name="title-complete">Water pollution V : modelling, measuring and prediction /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder">modelling, measuring and prediction /</str>
-      <str name="title-responsibility">editors, C.A. Brebbia, P. Anagnostopoulos</str>
-    </doc>
-    <doc>
-      <float name="score">1.9131546</float>
-      <str name="author">Powell, J. M.</str>
-      <str name="author-date"/>
-      <str name="author-title"/>
-      <arr name="date">
-        <str>1998</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1998</str>
-      </arr>
-      <str name="id">   00340598 </str>
-      <str name="id_exact">   00340598 </str>
-      <arr name="isbn">
-        <str>0730974170</str>
-      </arr>
-      <arr name="lccn">
-        <str>   00340598 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>30 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>100 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>ill., maps ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>1998.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>Water and Rivers Commission,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Perth, W.A. :</str>
-      </arr>
-      <arr name="subject">
-        <str>Water resources development</str>
-        <str>Water-supply</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water resources development, Australia, Western Australia, History.</str>
-        <str>Water-supply, Australia, Western Australia.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water resources development</str>
-        <str>Water-supply</str>
-      </arr>
-      <arr name="system-control-nr">
-        <str>abn98297323</str>
-      </arr>
-      <str name="title">Watering the western third :</str>
-      <str name="title-complete">Watering the western third : water, land, and community in Western Australia, 1826-1998 /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder">water, land, and community in Western Australia, 1826-1998 /</str>
-      <str name="title-responsibility">J.M. Powell.</str>
-    </doc>
-    <doc>
-      <float name="score">1.9131546</float>
-      <str name="author">Shade, Patricia J.</str>
-      <str name="author-date"/>
-      <str name="author-title"/>
-      <arr name="date">
-        <str>1999</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1999</str>
-      </arr>
-      <str name="id">   00689246 </str>
-      <str name="id_exact">   00689246 </str>
-      <arr name="lccn">
-        <str>   00689246 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>28 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>iv, 36 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>ill., maps ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>1999.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>U.S. Dept. of the Interior, U.S. Geological Survey ;</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Honolulu, Hawaii :</str>
-      </arr>
-      <arr name="series-title">
-        <str>Water-resources investigations report ;</str>
-      </arr>
-      <arr name="subject">
-        <str>Water balance</str>
-        <str>Hydrology</str>
-        <str>Water-supply</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water balance (Hydrology), Hawaii, Maui.</str>
-        <str>Water-supply, Hawaii, Maui.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water balance</str>
-        <str>Hydrology</str>
-        <str>Water-supply</str>
-      </arr>
-      <str name="title">Water budget of East Maui, Hawaii /</str>
-      <str name="title-complete">Water budget of East Maui, Hawaii /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder"/>
-      <str name="title-responsibility">by Patricia J. Shade : prepared in cooperation with the County of Maui Department of Water Supply, State of Hawaii Commission on Water Resource Management.</str>
-    </doc>
-    <doc>
-      <float name="score">1.8935319</float>
-      <arr name="date">
-        <str>1997?</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1997?</str>
-      </arr>
-      <str name="id">   00371661 </str>
-      <str name="id_exact">   00371661 </str>
-      <arr name="lccn">
-        <str>   00371661 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <str name="meeting-date">(1997 :</str>
-      <str name="meeting-location">Madras, India)</str>
-      <str name="meeting-name">International Conference on Management of Drinking Water Resources</str>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>25 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>429 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>ill., maps ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>[1997?]</str>
-      </arr>
-      <arr name="publication-name">
-        <str>The Institute,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Chennai :</str>
-      </arr>
-      <arr name="subject">
-        <str>Drinking water</str>
-        <str>Water resources development</str>
-        <str>Water-supply</str>
-        <str>Water conservation</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Drinking water, India, Congresses.</str>
-        <str>Water resources development, India, Congresses.</str>
-        <str>Water-supply, India, Management, Congresses.</str>
-        <str>Water conservation, Government policy, India, Congresses.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Drinking water</str>
-        <str>Water resources development</str>
-        <str>Water-supply</str>
-        <str>Water conservation</str>
-      </arr>
-      <str name="title">International Conference on Management of Drinking Water Resources, Chennai, December 3-5, 1997 :</str>
-      <str name="title-complete">International Conference on Management of Drinking Water Resources, Chennai, December 3-5, 1997 : proceedings /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder">proceedings /</str>
-      <str name="title-responsibility">organised by Central Leather Research Institute, Anna University, Tamil Nadu Water Supply and Drainage Board.</str>
-    </doc>
-    <doc>
-      <float name="score">1.8935319</float>
-      <str name="author">Bauer, Steve.</str>
-      <str name="author-date"/>
-      <str name="author-title"/>
-      <arr name="date">
-        <str>1999</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1999</str>
-      </arr>
-      <arr name="description">
-        <str>"This document was developed for US Environmental Protection Agency, Region 10, Seattle Washington, with the Idaho Water Resources Institute, University of Idaho."</str>
-      </arr>
-      <str name="id">   00457130 </str>
-      <str name="id_exact">   00457130 </str>
-      <arr name="lccn">
-        <str>   00457130 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>28 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>viii, 99 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>ill., maps ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>1999.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>United States Environmental Protection Agency, Region 10 ;</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Seattle, WA :</str>
-      </arr>
-      <arr name="subject">
-        <str>United States</str>
-        <str>Indicators</str>
-        <str>Biology</str>
-        <str>Water quality management</str>
-        <str>Water quality</str>
-        <str>Water</str>
-      </arr>
-      <arr name="subject-long">
-        <str>United States., Federal Water Pollution Control Act.</str>
-        <str>Indicators (Biology)</str>
-        <str>Water quality management, United States.</str>
-        <str>Water quality, United States.</str>
-        <str>Water, Pollution, Law and legislation, United States.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>United States</str>
-        <str>Indicators</str>
-        <str>Biology</str>
-        <str>Water quality management</str>
-        <str>Water quality</str>
-        <str>Water</str>
-      </arr>
-      <arr name="system-control-nr">
-        <str>(OCoLC)ocm42633073</str>
-      </arr>
-      <str name="title">Aquatic habitat indicators and their application to water quality objectives within the Clean Water Act /</str>
-      <str name="title-complete">Aquatic habitat indicators and their application to water quality objectives within the Clean Water Act /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder"/>
-      <str name="title-responsibility">Stephen B. Bauer and Stephen C. Ralph.</str>
-    </doc>
-    <doc>
-      <float name="score">1.8935319</float>
-      <str name="author">Farnham, Henry P.</str>
-      <str name="author-date">1863-1929.</str>
-      <str name="author-title"/>
-      <arr name="date">
-        <str>1904</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1904</str>
-      </arr>
-      <str name="id">   04012965 </str>
-      <str name="id_exact">   04012965 </str>
-      <arr name="lccn">
-        <str>   04012965 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>24 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>3 v. (clxxx, 2956 p.) ;</str>
-      </arr>
-      <arr name="physical-format">
-        <str/>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>1904.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>The Lawyers Co-operative Publishing Company,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Rochester :</str>
-      </arr>
-      <arr name="subject">
-        <str>Water rights</str>
-        <str>Riparian rights</str>
-        <str>Water</str>
-        <str>Irrigation laws</str>
-        <str>Drainage laws</str>
-        <str>Water-supply</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water rights, United States.</str>
-        <str>Riparian rights, United States.</str>
-        <str>Water, Law and legislation, United States.</str>
-        <str>Irrigation laws, United States.</str>
-        <str>Drainage laws, United States.</str>
-        <str>Water-supply.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water rights</str>
-        <str>Riparian rights</str>
-        <str>Water</str>
-        <str>Irrigation laws</str>
-        <str>Drainage laws</str>
-        <str>Water-supply</str>
-      </arr>
-      <arr name="system-control-nr">
-        <str>(OCoLC)507586</str>
-      </arr>
-      <str name="title">The law of waters and water rights :</str>
-      <str name="title-complete">The law of waters and water rights : international, national, state, municipal, and individual, including irrigation, drainage, and municipal water supply /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder">international, national, state, municipal, and individual, including irrigation, drainage, and municipal water supply /</str>
-      <str name="title-responsibility">by Henry Philip Farnham.</str>
-    </doc>
-    <doc>
-      <float name="score">1.822052</float>
-      <arr name="date">
-        <str>2000</str>
-      </arr>
-      <arr name="date_exact">
-        <str>2000</str>
-      </arr>
-      <str name="id">   00108038 </str>
-      <str name="id_exact">   00108038 </str>
-      <arr name="lccn">
-        <str>   00108038 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>28 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>x, 240 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>maps ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>c2000.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>Pennsylvania Bar Institute,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>[Mechanicsburg, Pa.] :</str>
-      </arr>
-      <arr name="subject">
-        <str>Water</str>
-        <str>Rivers</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water, Law and legislation, Pennsylvania.</str>
-        <str>Rivers, Law and legislation, Pennsylvania.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water</str>
-        <str>Rivers</str>
-      </arr>
-      <str name="title">Water law.</str>
-      <str name="title-complete">Water law.</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder"/>
-      <str name="title-responsibility"/>
-    </doc>
-    <doc>
-      <float name="score">1.822052</float>
-      <str name="corporate-date">(2000 :</str>
-      <str name="corporate-location">Miami, Fla.)</str>
-      <str name="corporate-name">American Water Resources Association.</str>
-      <arr name="date">
-        <str>2000</str>
-      </arr>
-      <arr name="date_exact">
-        <str>2000</str>
-      </arr>
-      <str name="id">   00131698 </str>
-      <str name="id_exact">   00131698 </str>
-      <arr name="isbn">
-        <str>1882132521</str>
-      </arr>
-      <arr name="lccn">
-        <str>   00131698 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>28 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>xiii, 400 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>ill., maps ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>c2000.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>The Association,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Middleburg, Va. :</str>
-      </arr>
-      <arr name="subject">
-        <str>Water resources development</str>
-        <str>Coastal zone management</str>
-        <str>Water quality management</str>
-        <str>Water-supply</str>
-        <str>Urban hydrology</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water resources development, Congresses.</str>
-        <str>Coastal zone management, Congresses.</str>
-        <str>Water quality management, Congresses.</str>
-        <str>Water-supply, Congresses.</str>
-        <str>Urban hydrology, Congresses.</str>
-        <str>Water resources development, United States, Congresses.</str>
-        <str>Coastal zone management, United States, Congresses.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water resources development</str>
-        <str>Coastal zone management</str>
-        <str>Water quality management</str>
-        <str>Water-supply</str>
-        <str>Urban hydrology</str>
-      </arr>
-      <arr name="system-control-nr">
-        <str>(OCoLC)ocm45420923</str>
-      </arr>
-      <str name="title">Water quantity and quality issues in coastal urban areas :</str>
-      <str name="title-complete">Water quantity and quality issues in coastal urban areas : proceedings, American Water Resources Association's Annual Water Resources Conference : November 6-9, 2000, Miami Florida /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder">proceedings, American Water Resources Association's Annual Water Resources Conference : November 6-9, 2000, Miami Florida /</str>
-      <str name="title-responsibility">edited by Robert W. Higgins ; sponsored by the American Water Resources Association ; hosted by the Florida Section, American Water Resources Association ; co-sponsored by CH2M Hill ... [et al.].</str>
-    </doc>
-    <doc>
-      <float name="score">1.822052</float>
-      <str name="author">Lee, Richard</str>
-      <str name="author-date"/>
-      <str name="author-title"/>
-      <arr name="date">
-        <str>1999</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1999</str>
-      </arr>
-      <str name="id">   00265435  </str>
-      <str name="id_exact">   00265435  </str>
-      <arr name="isbn">
-        <str>0964981416</str>
-      </arr>
-      <arr name="lccn">
-        <str>   00265435  </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>23 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>iv, 331 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>ill., map ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>c1999.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>W. Tricker,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Independence, Ohio :</str>
-      </arr>
-      <arr name="subject">
-        <str>Water gardens</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water gardens, Miscellanea.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water gardens</str>
-      </arr>
-      <str name="title">Tricker's 1101 water gardening :</str>
-      <str name="title-complete">Tricker's 1101 water gardening : questions and answers /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder">questions and answers /</str>
-      <str name="title-responsibility">by Richard Lee.</str>
-    </doc>
-    <doc>
-      <float name="score">1.822052</float>
-      <str name="author">Rafiq, Abdul Qadir.</str>
-      <str name="author-date"/>
-      <str name="author-title"/>
-      <arr name="date">
-        <str>1999?</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1999?</str>
-      </arr>
-      <str name="id">   00283173 </str>
-      <str name="id_exact">   00283173 </str>
-      <arr name="lccn">
-        <str>   00283173 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>28 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>46 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>1 map ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>[1999?]</str>
-      </arr>
-      <arr name="publication-name">
-        <str>LEAD, Pakistan,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Islamabad :</str>
-      </arr>
-      <arr name="subject">
-        <str>Water resources development</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water resources development, Pakistan.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water resources development</str>
-      </arr>
-      <str name="title">Institutions &amp; leadership in water resource management /</str>
-      <str name="title-complete">Institutions &amp; leadership in water resource management /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder"/>
-      <str name="title-responsibility">Abdul Qadir Rafiq.</str>
-    </doc>
-    <doc>
-      <float name="score">1.8129189</float>
-      <str name="author">Gingerich, Stephen B.</str>
-      <str name="author-date"/>
-      <str name="author-title"/>
-      <arr name="date">
-        <str>1999</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1999</str>
-      </arr>
-      <str name="id">   00300149 </str>
-      <str name="id_exact">   00300149 </str>
-      <arr name="lccn">
-        <str>   00300149 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>28 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>iv, 38 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>ill., maps ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>1999.</str>
-      </arr>
-      <arr name="publication-name">
-        <str>U.S. Dept. of the Interior, U.S. Geological Survey ;</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Honolulu, Hawaii :</str>
-      </arr>
-      <arr name="series-title">
-        <str>Water-resources investigations report ;</str>
-      </arr>
-      <arr name="subject">
-        <str>Water balance</str>
-        <str>Hydrology</str>
-        <str>Groundwater</str>
-        <str>Water-supply</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water balance (Hydrology), Hawaii, Haiku Region.</str>
-        <str>Groundwater, Hawaii, Haiku Region.</str>
-        <str>Water-supply, Hawaii, Haiku Region.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water balance</str>
-        <str>Hydrology</str>
-        <str>Groundwater</str>
-        <str>Water-supply</str>
-      </arr>
-      <arr name="system-control-nr">
-        <str>(OCoLC)ocm43421325</str>
-      </arr>
-      <str name="title">Ground water and surface water in the Haiku area, East Maui, Hawaii /</str>
-      <str name="title-complete">Ground water and surface water in the Haiku area, East Maui, Hawaii /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder"/>
-      <str name="title-responsibility">by Stephen B. Gingerich ; prepared in cooperation with the County of Maui Department of Water Supply, State of Hawaii Commission on Water Resource Management.</str>
-    </doc>
-    <doc>
-      <float name="score">1.8129189</float>
-      <str name="corporate-date"/>
-      <str name="corporate-location"/>
-      <str name="corporate-name">Texas Natural Resource Conservation Commission.</str>
-      <arr name="date">
-        <str>1999</str>
-      </arr>
-      <arr name="date_exact">
-        <str>1999</str>
-      </arr>
-      <arr name="description">
-        <str>"June 1999."</str>
-        <str>"GI-252"--Cover.</str>
-      </arr>
-      <str name="id">   00301741 </str>
-      <str name="id_exact">   00301741 </str>
-      <arr name="lccn">
-        <str>   00301741 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>28 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>1 v. (various pagings) :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>ill. ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>[1999]</str>
-      </arr>
-      <arr name="publication-name">
-        <str>The Commission,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Austin, TX :</str>
-      </arr>
-      <arr name="subject">
-        <str>Water quality</str>
-        <str>Water</str>
-        <str>Water quality biological assessment</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water quality, Texas, Measurement, Handbooks, manuals, etc.</str>
-        <str>Water, Sampling, Texas, Handbooks, manuals, etc.</str>
-        <str>Water, Texas, Analysis, Handbooks, manuals, etc.</str>
-        <str>Water quality biological assessment, Texas, Handbooks, manuals, etc.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water quality</str>
-        <str>Water</str>
-        <str>Water quality biological assessment</str>
-      </arr>
-      <arr name="system-control-nr">
-        <str>(OCoLC)ocm43074299</str>
-      </arr>
-      <str name="title">Surface water quality monitoring procedures manual /</str>
-      <str name="title-complete">Surface water quality monitoring procedures manual /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder"/>
-      <str name="title-responsibility">prepared by the Surface Water Quality Monitoring Program, Water Quality Division, Texas Natural Resource Conservation Commission.</str>
-    </doc>
-    <doc>
-      <float name="score">1.8129189</float>
-      <arr name="date">
-        <str>2000</str>
-      </arr>
-      <arr name="date_exact">
-        <str>2000</str>
-      </arr>
-      <arr name="description">
-        <str>"May 2000."</str>
-        <str>"EPA/600/R-00/025."</str>
-        <str>"EPA Contract 68-C7-0011, work assignment 0-38."</str>
-      </arr>
-      <str name="id">   00326482 </str>
-      <str name="id_exact">   00326482 </str>
-      <arr name="lccn">
-        <str>   00326482 </str>
-      </arr>
-      <arr name="medium">
-        <str>book</str>
-      </arr>
-      <arr name="medium_exact">
-        <str>book</str>
-      </arr>
-      <arr name="physical-accomp">
-        <str/>
-      </arr>
-      <arr name="physical-dimensions">
-        <str>28 cm.</str>
-      </arr>
-      <arr name="physical-extent">
-        <str>ix, 38 p. :</str>
-      </arr>
-      <arr name="physical-format">
-        <str>ill. ;</str>
-      </arr>
-      <arr name="physical-specified">
-        <str/>
-      </arr>
-      <arr name="physical-unitsize">
-        <str/>
-      </arr>
-      <arr name="physical-unittype">
-        <str/>
-      </arr>
-      <arr name="publication-date">
-        <str>[2000]</str>
-      </arr>
-      <arr name="publication-name">
-        <str>National Risk Management Research Laboratory, Office of Research and Development, U.S. Environmental Protection Agency,</str>
-      </arr>
-      <arr name="publication-place">
-        <str>Cincinnati, OH :</str>
-      </arr>
-      <arr name="subject">
-        <str>Water</str>
-        <str>Water treatment plant residuals</str>
-        <str>Water treatment plants</str>
-        <str>Drinking water</str>
-      </arr>
-      <arr name="subject-long">
-        <str>Water, Purification, Arsenic removal.</str>
-        <str>Water treatment plant residuals, Management.</str>
-        <str>Water treatment plants, Waste disposal.</str>
-        <str>Water, Pollution, Law and legislation, United States.</str>
-        <str>Drinking water, Law and legislation, United States.</str>
-      </arr>
-      <arr name="subject_exact">
-        <str>Water</str>
-        <str>Water treatment plant residuals</str>
-        <str>Water treatment plants</str>
-        <str>Drinking water</str>
-      </arr>
-      <str name="title">Regulations on the disposal of arsenic residuals from drinking water treatment plants /</str>
-      <str name="title-complete">Regulations on the disposal of arsenic residuals from drinking water treatment plants /</str>
-      <str name="title-dates"/>
-      <str name="title-medium"/>
-      <str name="title-number-section"/>
-      <str name="title-remainder"/>
-      <str name="title-responsibility">by Science Applications International Corporation, Reston, Virginia ; work assignment manager, Thomas J. Sorg.</str>
-    </doc>
-  </result>
-  <lst name="facet_counts">
-    <lst name="facet_queries"/>
-    <lst name="facet_fields">
-      <lst name="date">
-        <int name="2000">411</int>
-        <int name="1999">318</int>
-        <int name="1998">90</int>
-        <int name="2001">87</int>
-        <int name="1907">50</int>
-        <int name="1902">46</int>
-        <int name="1906">43</int>
-        <int name="1905">39</int>
-        <int name="1909">39</int>
-        <int name="1904">36</int>
-        <int name="1997">35</int>
-        <int name="1908">33</int>
-        <int name="1996">32</int>
-        <int name="1903">30</int>
-        <int name="1901">29</int>
-        <int name="1897">28</int>
-        <int name="1896">21</int>
-        <int name="1881">17</int>
-        <int name="1891">16</int>
-        <int name="1899">16</int>
-        <int name="1900">16</int>
-        <int name="1910">15</int>
-        <int name="1880">14</int>
-        <int name="1883">14</int>
-        <int name="1889">14</int>
-        <int name="1894">14</int>
-        <int name="1895">14</int>
-        <int name="1885">13</int>
-        <int name="1884">12</int>
-        <int name="1886">12</int>
-        <int name="1887">12</int>
-        <int name="1893">12</int>
-        <int name="1898">12</int>
-        <int name="1875">11</int>
-        <int name="1892">11</int>
-        <int name="1995">11</int>
-        <int name="1845">10</int>
-        <int name="1872">10</int>
-        <int name="1877">10</int>
-        <int name="1890">10</int>
-        <int name="1854">9</int>
-        <int name="1874">9</int>
-        <int name="1888">9</int>
-        <int name="1992">9</int>
-        <int name="1858">8</int>
-        <int name="1860">8</int>
-        <int name="1878">8</int>
-        <int name="1994">8</int>
-        <int name="1799">7</int>
-        <int name="1846">7</int>
-        <int name="1851">7</int>
-        <int name="1869">7</int>
-        <int name="1990">7</int>
-        <int name="1836">6</int>
-        <int name="1837">6</int>
-        <int name="1844">6</int>
-        <int name="1855">6</int>
-        <int name="1868">6</int>
-        <int name="1870">6</int>
-        <int name="1873">6</int>
-        <int name="2002">6</int>
-        <int name="1788">5</int>
-        <int name="1835">5</int>
-        <int name="1853">5</int>
-        <int name="1861">5</int>
-        <int name="1866">5</int>
-        <int name="1879">5</int>
-        <int name="1882">5</int>
-        <int name="1984">5</int>
-        <int name="1993">5</int>
-        <int name="1840">4</int>
-        <int name="1852">4</int>
-        <int name="1859">4</int>
-        <int name="1867">4</int>
-        <int name="1871">4</int>
-        <int name="1876">4</int>
-        <int name="1983">4</int>
-        <int name="1985">4</int>
-        <int name="19961999">4</int>
-        <int name="19992000">4</int>
-        <int name="1811">3</int>
-        <int name="1823">3</int>
-        <int name="1834">3</int>
-        <int name="1838">3</int>
-        <int name="1839">3</int>
-        <int name="1842">3</int>
-        <int name="1850">3</int>
-        <int name="1856">3</int>
-        <int name="1863">3</int>
-        <int name="1864">3</int>
-        <int name="1865">3</int>
-        <int name="199">3</int>
-        <int name="1991">3</int>
-        <int name="03">2</int>
-        <int name="1792">2</int>
-        <int name="1794">2</int>
-        <int name="1795">2</int>
-        <int name="1801">2</int>
-        <int name="1805">2</int>
-        <int name="1810">2</int>
-      </lst>
-      <lst name="medium_exact">
-        <int name="book">1984</int>
-        <int name="web">8</int>
-        <int name="book (electronic)">3</int>
-      </lst>
-      <lst name="subject_exact">
-        <int name="Water-supply">185</int>
-        <int name="Water">169</int>
-        <int name="Groundwater">94</int>
-        <int name="Water resources development">93</int>
-        <int name="Water quality">87</int>
-        <int name="Mineral waters">52</int>
-        <int name="Water quality management">50</int>
-        <int name="United States">43</int>
-        <int name="Irrigation">33</int>
-        <int name="N.Y.">28</int>
-        <int name="Hydraulic engineering">24</int>
-        <int name="Geology">23</int>
-        <int name="U.S.">23</int>
-        <int name="Groundwater flow">22</int>
-        <int name="Birds">21</int>
-        <int name="Hydrology">21</int>
-        <int name="Water rights">21</int>
-        <int name="American">20</int>
-        <int name="Drinking water">19</int>
-        <int name="Hydrogeology">19</int>
-        <int name="Water supply">18</int>
-        <int name="England">17</int>
-        <int name="Water use">17</int>
-        <int name="Fishes">16</int>
-        <int name="Love stories">16</int>
-        <int name="Rural">16</int>
-        <int name="Stream measurements">16</int>
-        <int name="Territorial waters">16</int>
-        <int name="Water quality biological assessment">16</int>
-        <int name="Water-supply engineering">16</int>
-        <int name="Christian fiction">15</int>
-        <int name="Domestic fiction">15</int>
-        <int name="Hydrotherapy">15</int>
-        <int name="Water conservation">15</int>
-        <int name="Great Britain">14</int>
-        <int name="Land use">14</int>
-        <int name="Mass.">14</int>
-        <int name="Nutrient pollution of water">14</int>
-        <int name="Floods">13</int>
-        <int name="Health resorts">13</int>
-        <int name="New York">13</int>
-        <int name="Streamflow">13</int>
-        <int name="Watershed management">13</int>
-        <int name="Sewage">12</int>
-        <int name="Water-power">12</int>
-        <int name="Ill.">11</int>
-        <int name="Indians of North America">11</int>
-        <int name="Inland navigation">11</int>
-        <int name="Italy">11</int>
-        <int name="Natural history">11</int>
-        <int name="Soils">11</int>
-        <int name="Water table">11</int>
-        <int name="Watercolor painting">11</int>
-        <int name="Aquifers">10</int>
-        <int name="Canals">10</int>
-        <int name="Hot-water heating">10</int>
-        <int name="Nitrates">10</int>
-        <int name="Psychological fiction">10</int>
-        <int name="Sanitation">10</int>
-        <int name="Chemistry">9</int>
-        <int name="Hydroelectric power plants">9</int>
-        <int name="Mississippi River Valley">9</int>
-        <int name="Radioactive pollution of water">9</int>
-        <int name="Rivers">9</int>
-        <int name="Science">9</int>
-        <int name="1939-1945">8</int>
-        <int name="Calif.">8</int>
-        <int name="California">8</int>
-        <int name="Canada">8</int>
-        <int name="Christian life">8</int>
-        <int name="Dams">8</int>
-        <int name="Harbors">8</int>
-        <int name="Historical fiction">8</int>
-        <int name="Inland water transportation">8</int>
-        <int name="Ipswich">8</int>
-        <int name="Irrigation laws">8</int>
-        <int name="Mississippi River">8</int>
-        <int name="Nonpoint source pollution">8</int>
-        <int name="Ohio River">8</int>
-        <int name="Psychology">8</int>
-        <int name="Sewerage">8</int>
-        <int name="Steam-boilers">8</int>
-        <int name="Water birds">8</int>
-        <int name="Water mills">8</int>
-        <int name="Watersheds">8</int>
-        <int name="World War">8</int>
-        <int name="Agriculture">7</int>
-        <int name="Biology">7</int>
-        <int name="Biotic communities">7</int>
-        <int name="Contaminated sediments">7</int>
-        <int name="Ecology">7</int>
-        <int name="Heating">7</int>
-        <int name="Hydraulics">7</int>
-        <int name="Indicators">7</int>
-        <int name="John">7</int>
-        <int name="Pesticides">7</int>
-        <int name="Stratigraphic">7</int>
-        <int name="W">7</int>
-        <int name="Washington">7</int>
-        <int name="Women">7</int>
-      </lst>
-      <lst name="author_exact">
-        <int name="Waters, Clara Erskine Clement,">9</int>
-        <int name="Waters, Henry F.">8</int>
-        <int name="Moorman, J. J.">7</int>
-        <int name="Waters, Thomas Franklin,">6</int>
-        <int name="Basak, P.">5</int>
-        <int name="Bergren, Lisa Tawn.">5</int>
-        <int name="Kingsley, Charles,">5</int>
-        <int name="Tyndall, John,">5</int>
-        <int name="Baldwin, William J.">4</int>
-        <int name="Holme, Charles,">4</int>
-        <int name="James, E. J.">4</int>
-        <int name="Nuttall, Thomas,">4</int>
-        <int name="Walton, George Edward,">4</int>
-        <int name="Wilkins, John H.">4</int>
-        <int name="Arthur, Kay,">3</int>
-        <int name="Byrd, Sandra.">3</int>
-        <int name="Conclin, George.">3</int>
-        <int name="Eliot, George,">3</int>
-        <int name="Emerson, James,">3</int>
-        <int name="Folwell, Amory Prescott,">3</int>
-        <int name="Frizell, Joseph P.">3</int>
-        <int name="Jones, Annie,">3</int>
-        <int name="Leverett, Frank,">3</int>
-        <int name="Mills, Robert,">3</int>
-        <int name="Pushpangadan, K.">3</int>
-        <int name="Rumsey, James,">3</int>
-        <int name="Spearman, Frank H.">3</int>
-        <int name="Spellman, Frank R.">3</int>
-        <int name="Towne, Douglas Clark,">3</int>
-        <int name="Turneaure, F. E.">3</int>
-        <int name="Waters, Robert Edmond Chester,">3</int>
-        <int name="Waters, Robert,">3</int>
-        <int name="Alcorn, Randy C.">2</int>
-        <int name="Ambrose, David,">2</int>
-        <int name="Baker, M. N.">2</int>
-        <int name="Baldwin, Loammi,">2</int>
-        <int name="Balsillie, James H.">2</int>
-        <int name="Baruch, Simon,">2</int>
-        <int name="Bergman, Torbern,">2</int>
-        <int name="Boyd, Nathan E.">2</int>
-        <int name="Browning, Elizabeth Barrett,">2</int>
-        <int name="Bryant, William Cullen,">2</int>
-        <int name="Chase, Eliza B.">2</int>
-        <int name="Chatterjee, S.">2</int>
-        <int name="Christensen, Victoria G.">2</int>
-        <int name="Cloud, Marshall Morgan,">2</int>
-        <int name="Cramer, Zadok,">2</int>
-        <int name="Cundall, H. M.">2</int>
-        <int name="Cunliffe-Owen, Marguerite,">2</int>
-        <int name="Dawson, Charles C.">2</int>
-        <int name="Ellet, Charles,">2</int>
-        <int name="Elliott, John G.">2</int>
-        <int name="Fairchild, Herman L.">2</int>
-        <int name="Fanning, John Thomas,">2</int>
-        <int name="Fatherree, Jim.">2</int>
-        <int name="Garbarino, John R.">2</int>
-        <int name="Gingerich, Stephen B.">2</int>
-        <int name="Gordon, J. D.">2</int>
-        <int name="Hale, Edward Everett,">2</int>
-        <int name="Halliwell-Phillipps, J. O.">2</int>
-        <int name="Harland, Marion,">2</int>
-        <int name="Hazen, Allen,">2</int>
-        <int name="Hazlehurst, James Nisbit.">2</int>
-        <int name="Howells, William Dean,">2</int>
-        <int name="Jacobson, Cliff.">2</int>
-        <int name="Johnson, Emory Richard,">2</int>
-        <int name="Jones, Harry Clary,">2</int>
-        <int name="Jordan, David Starr,">2</int>
-        <int name="Kennedy, Laurie E.">2</int>
-        <int name="King, Thomas,">2</int>
-        <int name="Laffan, William M.">2</int>
-        <int name="Lawlor, Sean M.">2</int>
-        <int name="Leffmann, Henry,">2</int>
-        <int name="Lorimer, Norma,">2</int>
-        <int name="Magner, D.">2</int>
-        <int name="Mahan, A. T.">2</int>
-        <int name="Mansfield, Robert Blachford,">2</int>
-        <int name="Mason, William Pitt,">2</int>
-        <int name="Mathews, F. Schuyler">2</int>
-        <int name="Molina Bedoya, Felipe,">2</int>
-        <int name="Moon, James H.,">2</int>
-        <int name="Nazimuddin, M.">2</int>
-        <int name="Nissen, Hartvig,">2</int>
-        <int name="O'Neil, Patrick E.">2</int>
-        <int name="Orcutt, Jane.">2</int>
-        <int name="Ott, A. G.">2</int>
-        <int name="Page, Jason.">2</int>
-        <int name="Parkhurst, H. E.">2</int>
-        <int name="Patterson, Kevin,">2</int>
-        <int name="Paul, Don S.">2</int>
-        <int name="Preston, H. W.">2</int>
-        <int name="Rafter, Geo. W.">2</int>
-        <int name="Richards, Ellen H.">2</int>
-        <int name="Richardson, C. J.">2</int>
-        <int name="Roosevelt, Robert Barnwell,">2</int>
-        <int name="Smeaton, John,">2</int>
-        <int name="Smith, Matthew Hale,">2</int>
-        <int name="Soler-López, Luis R.">2</int>
-        <int name="Vail, Isaac Newton,">2</int>
-        <int name="Waters, W. G.">2</int>
-      </lst>
-    </lst>
-    <lst name="facet_dates"/>
-  </lst>
-</response>
diff --git a/test/test_dads.urls b/test/test_dads.urls

deleted file mode 100644 (file)

index d8db7aa..0000000
--- a/test/test_dads.urls
+++ /dev/null
@@ -1,15 +0,0 @@
-http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=GET&pz%3Aname%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=SOLR+Test&pz%3Acclmap%3Ati%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Dtitle&pz%3Axslt%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=dads-pz2.xsl&pz%3Aqueryencoding%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=UTF-8&pz%3Aapdulog%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1&pz:facetmap:author%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=creator&pz:facetmap:subject%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=subject&pz:facetmap:date%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=creationdate&pz:extra_args%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=%26x-facet_def%3Ddbc_test_production%26x-noxsl%3D1&pz:query_syntax%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=pqf
-http://localhost:9763/search.pz2?session=1&command=search&query=water
-w 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%2Csubject%2Cauthor%2Cdate%2Cmedium
-http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=2&command=settings&pz:sru%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=solr&pz%3Aname%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=SOLR+Test&pz%3Acclmap%3Ati%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1%3Dtitle&pz%3Axslt%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=UTF-8&pz%3Aapdulog%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1&pz:termlist_term_count%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=5&pz:preferred%5Bdbc-test.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1
-http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22computer%22
-http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
-http://localhost:9763/search.pz2?session=2&command=show&block=preferred
-http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22xyzy%22
-http://localhost:9763/search.pz2?session=2&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=2&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
diff --git a/test/test_gbv_de.urls b/test/test_gbv_de.urls

deleted file mode 100644 (file)

index ad3e375..0000000
--- a/test/test_gbv_de.urls
+++ /dev/null
@@ -1,14 +0,0 @@
-http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1
-http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer%22
-w 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?command=init&clear=1
-http://localhost:9763/search.pz2?session=2&command=settings&pz:sru%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr&pz%3Aname%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=SOLR+Test&pz%3Acclmap%3Ati%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Asu%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Acclmap%3Aau%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Acclmap%3Aisbn%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Acclmap%3Aterm%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Axslt%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Aqueryencoding%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=UTF-8&pz%3Aapdulog%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1&pz:termlist_term_count%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=5&pz:preferred%5Blocalhost%3A8983%2Fsolr%2Fselect%5D=1
-http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22computer%22
-http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
-http://localhost:9763/search.pz2?session=2&command=show&block=preferred
-http://localhost:9763/search.pz2?session=2&command=search&query=su%3D%22xyzy%22
-http://localhost:9763/search.pz2?session=2&command=show&block=preferred
-http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate
diff --git a/test/test_solr_spell.cfg b/test/test_solr_spell.cfg

deleted file mode 100644 (file)

index 1c30567..0000000
--- a/test/test_solr_spell.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
-  <!-- Used by test_solr.sh -->
-  <server>
-    <listen port="9763"/>
-    
-    <service>
-      <metadata name="url" merge="unique"/>
-      <metadata name="title" brief="yes" sortkey="skiparticle" merge="longest" rank="6" mergekey="required" />
-      <metadata name="title-remainder" brief="yes" merge="longest" rank="5"/>
-      <metadata name="isbn"/>
-      <metadata name="date" brief="yes" sortkey="numeric" type="year" merge="range"
-               termlist="yes"/>
-      <metadata name="author" brief="yes" termlist="yes" merge="longest" rank="2" mergekey="optional" />
-      <metadata name="subject" merge="unique" termlist="yes" rank="3"/>
-      <metadata name="id"/>
-      <metadata name="lccn" merge="unique"/>
-      <metadata name="description" brief="yes" merge="longest" rank="3"/>
-
-      <metadata name="medium" brief="yes" merge="longest" mergekey="optional" termlist="yes"/>      
-
-      <metadata name="test-usersetting" brief="yes" setting="postproc"/>
-      <metadata name="test" setting="parameter"/>
-      <metadata name="test-usersetting-2" brief="yes"/>
-    </service>
-
-  </server>
-
-</pazpar2>
-<!-- Keep this comment at the end of the file
-     Local variables:
-     mode: nxml
-     End:
--->
diff --git a/test/test_solr_spell.sh b/test/test_solr_spell.sh

deleted file mode 100755 (executable)

index 5d177c7..0000000
--- a/test/test_solr_spell.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-
-TEST=`basename $0 .sh`
-# srcdir might be set by make
-srcdir=${srcdir:-"."}
-
-exec ${srcdir}/run_pazpar2.sh $TEST
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation: 2
-# sh-basic-offset: 4
-# End:
diff --git a/test/test_solr_spell.urls b/test/test_solr_spell.urls

deleted file mode 100644 (file)

index f358d6e..0000000
--- a/test/test_solr_spell.urls
+++ /dev/null
@@ -1,6 +0,0 @@
-http://localhost:9763/search.pz2?command=init&clear=1
-http://localhost:9763/search.pz2?session=1&command=settings&pz%3Atermlist_term_count%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=10&use_url_proxy%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Apiggyback%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Apreferred%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1&pz%3Acclmap%3Asu%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dsubject&pz%3Asru%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=solr&use_thumbnails%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=0&pz%3Acclmap%3Adate%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Ddate&medium%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=web&pz%3Aname%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=ocs_test&pz%3Acclmap%3Aissn%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=u%3D8&pz%3Acclmap%3Ati%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtitle&pz%3Acclmap%3Aau%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dauthor&pz%3Axslt%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=solr-pz2.xsl&pz%3Acclmap%3Aterm%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Dtext+s%3Dal&pz%3Acclmap%3Aisbn%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=1%3Disbn&pz%3Aqueryencoding%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=UTF-8&pz%3Aextra_args%5Bocs-test.indexdata.com%2Fsolr%2Fselect%5D=spellcheck=true
-http://localhost:9763/search.pz2?session=1&command=search&query=kingg
-w 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=bytarget
diff --git a/win/makefile b/win/makefile

index 85a89cc..b1f9f63 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -5,7 +5,7 @@
  DEBUG=0   # 0 for release, 1 for debug
  USE_MANIFEST = 0 # Can be enabled Visual Studio 2005/2008
  PACKAGE_NAME=pazpar2
-PACKAGE_VERSION=1.8.5
+PACKAGE_VERSION=1.8.6
  
  # YAZ
  YAZ_DIR=..\..\yaz
author	Adam Dickmeiss <adam@indexdata.dk>
	Fri, 6 Mar 2015 10:17:31 +0000 (11:17 +0100)
committer	Adam Dickmeiss <adam@indexdata.dk>
	Fri, 6 Mar 2015 10:17:31 +0000 (11:17 +0100)
IDMETA		patch \| blob \| history
LICENSE		patch \| blob \| history
NEWS		patch \| blob \| history
README		patch \| blob \| history
debian/control		patch \| blob \| history
debian/pazpar2-apache2.postinst		patch \| blob \| history
debian/pazpar2-js.postinst	[deleted file]	patch \| blob \| history
debian/pazpar2-js.postrm	[deleted file]	patch \| blob \| history
doc/entities.ent		patch \| blob \| history
doc/pazpar2_conf.xml		patch \| blob \| history
doc/pazpar2_protocol.xml		patch \| blob \| history
src/session.c		patch \| blob \| history
src/session.h		patch \| blob \| history
test/test-solr.xml	[deleted file]	patch \| blob \| history
test/test_dads.urls	[deleted file]	patch \| blob \| history
test/test_gbv_de.urls	[deleted file]	patch \| blob \| history
test/test_solr_spell.cfg	[deleted file]	patch \| blob \| history
test/test_solr_spell.sh	[deleted file]	patch \| blob \| history
test/test_solr_spell.urls	[deleted file]	patch \| blob \| history
win/makefile		patch \| blob \| history