Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Fri, 30 Sep 2011 12:34:11 +0000 (14:34 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 30 Sep 2011 12:34:11 +0000 (14:34 +0200)
47 files changed:
NEWS
configure.ac
debian/changelog
debian/control
doc/pazpar2_conf.xml
doc/pazpar2_protocol.xml
pazpar2.spec
src/client.c
src/facet_limit.c
src/http_command.c
src/session.c
src/session.h
src/termlists.c
test/Makefile.am
test/test_dads.cfg
test/test_facets.cfg
test/test_facets_11.res
test/test_facets_14.res
test/test_facets_17.res
test/test_facets_18.res
test/test_facets_24.res
test/test_facets_6.res
test/test_http.urls
test/test_icu.cfg
test/test_icu_8.res
test/test_preferred.cfg
test/test_settings.cfg
test/test_solr.cfg
test/test_solr.urls
test/test_solr_10.res [deleted file]
test/test_solr_11.res [deleted file]
test/test_solr_12.res [deleted file]
test/test_solr_13.res [deleted file]
test/test_solr_14.res [deleted file]
test/test_solr_15.res [deleted file]
test/test_solr_16.res [deleted file]
test/test_solr_17.res [deleted file]
test/test_solr_4.res
test/test_solr_5.res
test/test_solr_6.res [deleted file]
test/test_solr_7.res [deleted file]
test/test_solr_8.res [deleted file]
test/test_solr_9.res [deleted file]
test/test_sru-proxy.cfg
test/test_sru.cfg
test/test_turbomarcxml.cfg
win/makefile

diff --git a/NEWS b/NEWS
index 0889356..66ab475 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+
+command=termlist without name parameter returns all termlists/facets.
+Previously if name parameter was omitted, only "subject" was returned.
+
+--- 1.6.3 2011/09/22
+
+Make termlist sorting stable. Terms with same frequency are now sorted by
+their display name. This makes a pretty display and improves our
+regression test because qsort is not a stable sort.
+
+New sort parameter value 'position'. The 'position' sorts merged records
+by their original position from the remote target. This is primarily useful
+for debugging and may be used for targets that already perform some kind
+of relevance ranking. Note that sort by default is decreasing; so to get
+records in their original order sort=position:1 must be used.
+
 --- 1.6.2 2011/09/15
 
 tmarc.xsl: yet another 773$g fix. Was broken in 1.6.1 as well.
index 4c53253..500a801 100644 (file)
@@ -5,7 +5,7 @@
 
 # Autoconf and automake setup
 AC_PREREQ(2.60)
-AC_INIT([pazpar2],[1.6.2],[pazpar2-help@indexdata.dk])
+AC_INIT([pazpar2],[1.6.3],[pazpar2-help@indexdata.dk])
 
 AC_CONFIG_HEADERS(src/config.h)
 
@@ -22,7 +22,7 @@ AC_LANG(C)
 
 AC_C_INLINE
 
-YAZ_INIT([static icu],[4.2.0])
+YAZ_INIT([static icu],[4.2.17])
 if test -z "$YAZLIB"; then
        AC_MSG_ERROR([YAZ development libraries missing])
 fi
index ead961d..fc93eaa 100644 (file)
@@ -1,3 +1,9 @@
+pazpar2 (1.6.3-1indexdata) unstable; urgency=low
+
+  * Upstream.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 22 Sep 2011 12:49:36 +0200
+
 pazpar2 (1.6.2-1indexdata) unstable; urgency=low
 
   * Upstream.
index 94cdd50..1e8ef4a 100644 (file)
@@ -2,7 +2,11 @@ Source: pazpar2
 Section: net
 Priority: extra
 Maintainer: Adam Dickmeiss <adam@indexdata.dk>
-Build-Depends: debhelper (>= 5), autotools-dev, libyaz4-dev (>= 4.2.0), docbook-xsl, libgnutls-dev
+Build-Depends: debhelper (>= 5),
+       autotools-dev,
+       libyaz4-dev (>= 4.2.17),
+       docbook-xsl,
+       libgnutls-dev
 Standards-Version: 3.7.2
 
 Package: pazpar2
index 887e894..ef4cdb9 100644 (file)
      </listitem>
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry id="limitmap">
      <term>pz:limitmap:<replaceable>name</replaceable></term>
      <listitem>
       <para>
index fd10f67..a9e28b8 100644 (file)
@@ -188,13 +188,16 @@ search.pz?command=settings&session=2044502273&pz:allow[search.com:210/db1]=1
        <para>
        Limits the search to a given set of targets specified by the
        filter. The filter consists a comma separated list of
-       setting+operator+args pairs. The setting is a Pazpar2 setting
+       <emphasis>setting</emphasis>+<emphasis>operator</emphasis>+<emphasis>args</emphasis>
+       pairs. The <emphasis>setting</emphasis> is a Pazpar2 setting
        (such as <literal>pz:id</literal>).
-       The operator is either = (string match)
-       or ~ (substring match). The args is a list of values separated
-       by | (or , one of the values). The idea is that only targets
-       with a setting matching one of the values given will be included
-       in the search.
+       The <emphasis>operator</emphasis> is either
+       <literal>=</literal> (string match)
+       or <literal>~</literal> (substring match).
+       The <emphasis>args</emphasis> is a list of values separated
+       by <literal>|</literal> (or , one of the values).
+       The idea is that only targets with a setting matching one of
+       the values given will be included in the search.
        </para>
       </listitem>
      </varlistentry>
@@ -202,12 +205,17 @@ search.pz?command=settings&session=2044502273&pz:allow[search.com:210/db1]=1
       <term>limit</term>
       <listitem>
        <para>
-       Narrows the search by one or more fields (typicall facets).
-       The limit is sequence of one or more field=value pairs separate
-       by comma.
-       A value that contains a comma should be escaped by backslash (\).
-       The pz:fazetmap configuration item defines how the searches are 
-       mapped to a database.
+       Narrows the search by one or more fields (typically facets).
+       The limit is sequence of one or more
+       <emphasis>name</emphasis>=<emphasis>args</emphasis> pairs separated
+       by comma. The <emphasis>args</emphasis> is a list of values
+       separated by vertical bar (<literal>|</literal>).
+       The meaning of <literal>|</literal> is alternative, ie OR .
+       A value that contains a comma (<literal>,</literal>),
+       a vertical bar (<literal>|</literal>) or
+       backslash itself must be preceded by backslash (<literal>\</literal>).
+       The <link linkend="limitmap">pz:limitmap</link> configuration
+       item defines how the searches are mapped to a database.
        </para>
       </listitem>
      </varlistentry>
@@ -506,7 +514,8 @@ search.pz2?session=605047297&command=record&id=3
       <term>name</term>
       <listitem>
        <para>
-       comma-separated list of termlist names (default "subject")
+       comma-separated list of termlist names. If omitted,
+       all termlists are returned.
        </para>
       </listitem>
      </varlistentry>
index c038139..ec20f87 100644 (file)
@@ -1,17 +1,17 @@
 Summary: Metasearcher
 Name: pazpar2
-Version: 1.6.2
+Version: 1.6.3
 Release: 1indexdata
 License: GPL
 Group: Applications/Internet
 Vendor: Index Data ApS <info@indexdata.dk>
 Source: pazpar2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libyaz4-devel >= 4.2.0
+BuildRequires: libyaz4-devel >= 4.2.17
 Packager: Adam Dickmeiss <adam@indexdata.dk>
 URL: http://www.indexdata.com/pazpar2
 Summary: pazpar2 daemon
-Requires: libyaz4
+Requires: libyaz4 >= 4.2.17
 
 %description
 Pazpar2 is a high-performance, user interface-independent, data
index dcda559..e0b9ee1 100644 (file)
@@ -943,6 +943,7 @@ static void apply_limit(struct session_database *sdb,
     int i = 0;
     const char *name;
     const char *value;
+    NMEM nmem_tmp = nmem_create();
     for (i = 0; (name = facet_limits_get(facet_limits, i, &value)); i++)
     {
         struct setting *s = 0;
@@ -952,32 +953,55 @@ static void apply_limit(struct session_database *sdb,
             const char *p = strchr(s->name + 3, ':');
             if (p && !strcmp(p + 1, name) && s->value)
             {
+                char **values = 0;
+                int i, num = 0;
+                nmem_strsplit_escape2(nmem_tmp, "|", value, &values,
+                                      &num, 1, '\\', 1);
+
                 if (!strncmp(s->value, "rpn:", 4))
                 {
                     const char *pqf = s->value + 4;
+
                     wrbuf_puts(w_pqf, "@and ");
                     wrbuf_puts(w_pqf, pqf);
                     wrbuf_puts(w_pqf, " ");
-                    yaz_encode_pqf_term(w_pqf, value, strlen(value));
+                    for (i = 0; i < num; i++)
+                    {
+                        if (i < num - 1)
+                            wrbuf_puts(w_pqf, "@or ");
+                        yaz_encode_pqf_term(w_pqf, values[i],
+                                            strlen(values[i]));
+                    }
                 }
                 else if (!strncmp(s->value, "ccl:", 4))
                 {
                     const char *ccl = s->value + 4;
-                    wrbuf_puts(w_ccl, " and ");
-                    wrbuf_puts(w_ccl, ccl);
-                    wrbuf_puts(w_ccl, "=\"");
-                    wrbuf_puts(w_ccl, value);
-                    wrbuf_puts(w_ccl, "\"");
+
+                    wrbuf_puts(w_ccl, " and (");
+
+                    for (i = 0; i < num; i++)
+                    {
+                        if (i)
+                            wrbuf_puts(w_ccl, " or ");
+                        wrbuf_puts(w_ccl, ccl);
+                        wrbuf_puts(w_ccl, "=\"");
+                        wrbuf_puts(w_ccl, values[i]);
+                        wrbuf_puts(w_ccl, "\"");
+                    }
+                    wrbuf_puts(w_ccl, ")");
+
                 }
                 break;
             }
         }
+        nmem_reset(nmem_tmp);
         if (!s)
         {
             yaz_log(YLOG_WARN, "Target %s: limit %s used, but no limitmap defined",
                     (sdb->database ? sdb->database->url : "<no url>"), name);
         }
     }
+    nmem_destroy(nmem_tmp);
 }
                         
 // Parse the query given the settings specific to this client
index dca5c29..44bcff0 100644 (file)
@@ -48,8 +48,8 @@ facet_limits_t facet_limits_create(const char *param)
     fl->num = 0;
     fl->darray = 0;
     if (param)
-        nmem_strsplit_escape(fl->nmem, ",", param, &fl->darray,
-                             &fl->num, 1, '\\');
+        nmem_strsplit_escape2(fl->nmem, ",", param, &fl->darray,
+                              &fl->num, 1, '\\', 0);
     /* replace = with \0 .. for each item */
     for (i = 0; i < fl->num; i++)
     {
index b46ba7b..07e37be 100644 (file)
@@ -489,55 +489,6 @@ static void cmd_settings(struct http_channel *c)
     release_session(c, s);
 }
 
-// Compares two hitsbytarget nodes by hitcount
-static int cmp_ht(const void *p1, const void *p2)
-{
-    const struct hitsbytarget *h1 = p1;
-    const struct hitsbytarget *h2 = p2;
-    return h2->hits - h1->hits;
-}
-
-// This implements functionality somewhat similar to 'bytarget', but in a termlist form
-static int targets_termlist(WRBUF wrbuf, struct session *se, int num,
-                             NMEM nmem)
-{
-    struct hitsbytarget *ht;
-    int count, i;
-
-    ht = hitsbytarget(se, &count, nmem);
-    qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht);
-    for (i = 0; i < count && i < num && ht[i].hits > 0; i++)
-    {
-
-        // do only print terms which have display names
-    
-        wrbuf_puts(wrbuf, "<term>\n");
-
-        wrbuf_puts(wrbuf, "<id>");
-        wrbuf_xmlputs(wrbuf, ht[i].id);
-        wrbuf_puts(wrbuf, "</id>\n");
-        
-        wrbuf_puts(wrbuf, "<name>");
-        if (!ht[i].name || !ht[i].name[0])
-            wrbuf_xmlputs(wrbuf, "NO TARGET NAME");
-        else
-            wrbuf_xmlputs(wrbuf, ht[i].name);
-        wrbuf_puts(wrbuf, "</name>\n");
-        
-        wrbuf_printf(wrbuf, "<frequency>" ODR_INT_PRINTF "</frequency>\n",
-                     ht[i].hits);
-        
-        wrbuf_puts(wrbuf, "<state>");
-        wrbuf_xmlputs(wrbuf, ht[i].state);
-        wrbuf_puts(wrbuf, "</state>\n");
-        
-        wrbuf_printf(wrbuf, "<diagnostic>%d</diagnostic>\n", 
-                     ht[i].diagnostic);
-        wrbuf_puts(wrbuf, "</term>\n");
-    }
-    return count;
-}
-
 static void cmd_termlist(struct http_channel *c)
 {
     struct http_response *rs = c->response;
@@ -547,79 +498,23 @@ static void cmd_termlist(struct http_channel *c)
     const char *nums = http_argbyname(rq, "num");
     int num = 15;
     int status;
-    WRBUF debug_log = 0;
 
     if (!s)
         return;
 
     status = session_active_clients(s->psession);
 
-    if (!name)
-        name = "subject";
-    if (strlen(name) > 255)
-        return;
     if (nums)
         num = atoi(nums);
 
-    debug_log = wrbuf_alloc();
-
     wrbuf_rewind(c->wrbuf);
 
     wrbuf_puts(c->wrbuf, "<termlist>\n");
     wrbuf_printf(c->wrbuf, "<activeclients>%d</activeclients>\n", status);
-    while (*name)
-    {
-        char tname[256];
-        const char *tp;
-
-        if (!(tp = strchr(name, ',')))
-            tp = name + strlen(name);
-        strncpy(tname, name, tp - name);
-        tname[tp - name] = '\0';
-        wrbuf_puts(c->wrbuf, "<list name=\"");
-        wrbuf_xmlputs(c->wrbuf, tname);
-        wrbuf_puts(c->wrbuf, "\">\n");
-        if (!strcmp(tname, "xtargets"))
-        {
-            int targets = targets_termlist(c->wrbuf, s->psession, num, c->nmem);
-            wrbuf_printf(debug_log, " xtargets: %d", targets);
-        }
-        else
-        {
-            int len;
-            struct termlist_score **p = 
-                get_termlist_score(s->psession, tname, &len);
-            if (p && len)
-                wrbuf_printf(debug_log, " %s: %d", tname, len);
-            if (p)
-            {
-                int i;
-                for (i = 0; i < len && i < num; i++)
-                {
-                    // prevnt sending empty term elements
-                    if (!p[i]->display_term || !p[i]->display_term[0])
-                        continue;
-
-                    wrbuf_puts(c->wrbuf, "<term>");
-                    wrbuf_puts(c->wrbuf, "<name>");
-                    wrbuf_xmlputs(c->wrbuf, p[i]->display_term);
-                    wrbuf_puts(c->wrbuf, "</name>");
-                    
-                    wrbuf_printf(c->wrbuf, 
-                                 "<frequency>%d</frequency>", 
-                                 p[i]->frequency);
-                    wrbuf_puts(c->wrbuf, "</term>\n");
-                }
-            }
-        }
-        wrbuf_puts(c->wrbuf, "</list>\n");
-        name = tp;
-        if (*name == ',')
-            name++;
-    }
+
+    perform_termlist(c, s->psession, name, num);
+
     wrbuf_puts(c->wrbuf, "</termlist>\n");
-    yaz_log(YLOG_DEBUG, "termlist response: %s ", wrbuf_cstr(debug_log));
-    wrbuf_destroy(debug_log);
     rs->payload = nmem_strdup(rq->channel->nmem, wrbuf_cstr(c->wrbuf));
     http_send_response(c);
     release_session(c, s);
@@ -711,7 +606,7 @@ static void cmd_bytarget(struct http_channel *c)
 
     if (!s)
         return;
-    ht = hitsbytarget(s->psession, &count, c->nmem);
+    ht = get_hitsbytarget(s->psession, &count, c->nmem);
     wrbuf_rewind(c->wrbuf);
     wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<bytarget><status>OK</status>");
 
index 72feef6..697df85 100644 (file)
@@ -837,13 +837,13 @@ struct session *new_session(NMEM nmem, struct conf_service *service,
     return session;
 }
 
-struct hitsbytarget *hitsbytarget(struct session *se, int *count, NMEM nmem)
+static struct hitsbytarget *hitsbytarget_nb(struct session *se,
+                                            int *count, NMEM nmem)
 {
     struct hitsbytarget *res = 0;
     struct client_list *l;
     size_t sz = 0;
 
-    session_enter(se);
     for (l = se->clients; l; l = l->next)
         sz++;
 
@@ -868,10 +868,18 @@ struct hitsbytarget *hitsbytarget(struct session *se, int *count, NMEM nmem)
         wrbuf_destroy(w);
         (*count)++;
     }
-    session_leave(se);
     return res;
 }
 
+struct hitsbytarget *get_hitsbytarget(struct session *se, int *count, NMEM nmem)
+{
+    struct hitsbytarget *p;
+    session_enter(se);
+    p = hitsbytarget_nb(se, count, nmem);
+    session_leave(se);
+    return p;
+}
+    
 struct termlist_score **get_termlist_score(struct session *se,
                                            const char *name, int *num)
 {
@@ -889,6 +897,118 @@ struct termlist_score **get_termlist_score(struct session *se,
     return tl;
 }
 
+// Compares two hitsbytarget nodes by hitcount
+static int cmp_ht(const void *p1, const void *p2)
+{
+    const struct hitsbytarget *h1 = p1;
+    const struct hitsbytarget *h2 = p2;
+    return h2->hits - h1->hits;
+}
+
+static int targets_termlist_nb(WRBUF wrbuf, struct session *se, int num,
+                               NMEM nmem)
+{
+    struct hitsbytarget *ht;
+    int count, i;
+
+    ht = hitsbytarget_nb(se, &count, nmem);
+    qsort(ht, count, sizeof(struct hitsbytarget), cmp_ht);
+    for (i = 0; i < count && i < num && ht[i].hits > 0; i++)
+    {
+
+        // do only print terms which have display names
+    
+        wrbuf_puts(wrbuf, "<term>\n");
+
+        wrbuf_puts(wrbuf, "<id>");
+        wrbuf_xmlputs(wrbuf, ht[i].id);
+        wrbuf_puts(wrbuf, "</id>\n");
+        
+        wrbuf_puts(wrbuf, "<name>");
+        if (!ht[i].name || !ht[i].name[0])
+            wrbuf_xmlputs(wrbuf, "NO TARGET NAME");
+        else
+            wrbuf_xmlputs(wrbuf, ht[i].name);
+        wrbuf_puts(wrbuf, "</name>\n");
+        
+        wrbuf_printf(wrbuf, "<frequency>" ODR_INT_PRINTF "</frequency>\n",
+                     ht[i].hits);
+        
+        wrbuf_puts(wrbuf, "<state>");
+        wrbuf_xmlputs(wrbuf, ht[i].state);
+        wrbuf_puts(wrbuf, "</state>\n");
+        
+        wrbuf_printf(wrbuf, "<diagnostic>%d</diagnostic>\n", 
+                     ht[i].diagnostic);
+        wrbuf_puts(wrbuf, "</term>\n");
+    }
+    return count;
+}
+
+void perform_termlist(struct http_channel *c, struct session *se,
+                      const char *name, int num)
+{
+    int i, j;
+    NMEM nmem_tmp = nmem_create();
+    char **names;
+    int num_names = 0;
+
+    if (name)
+        nmem_strsplit(nmem_tmp, ",", name, &names, &num_names);
+
+    session_enter(se);
+
+    for (j = 0; j < num_names; j++)
+    {
+        const char *tname;
+        for (i = 0; i < se->num_termlists; i++)
+        {
+            tname = se->termlists[i].name;
+            if (num_names > 0 && !strcmp(names[j], tname))
+            {
+                struct termlist_score **p = 0;
+                int len;
+                p = termlist_highscore(se->termlists[i].termlist, &len);
+                if (p)
+                {
+                    int i;
+                    wrbuf_puts(c->wrbuf, "<list name=\"");
+                    wrbuf_xmlputs(c->wrbuf, tname);
+                    wrbuf_puts(c->wrbuf, "\">\n");
+                    for (i = 0; i < len && i < num; i++)
+                    {
+                        // prevent sending empty term elements
+                        if (!p[i]->display_term || !p[i]->display_term[0])
+                            continue;
+                        
+                        wrbuf_puts(c->wrbuf, "<term>");
+                        wrbuf_puts(c->wrbuf, "<name>");
+                        wrbuf_xmlputs(c->wrbuf, p[i]->display_term);
+                        wrbuf_puts(c->wrbuf, "</name>");
+                        
+                        wrbuf_printf(c->wrbuf, 
+                                     "<frequency>%d</frequency>", 
+                                     p[i]->frequency);
+                        wrbuf_puts(c->wrbuf, "</term>\n");
+                    }
+                    wrbuf_puts(c->wrbuf, "</list>\n");
+                }
+            }
+        }
+        tname = "xtargets";
+        if (num_names > 0 && !strcmp(names[j], tname))
+        {
+            wrbuf_puts(c->wrbuf, "<list name=\"");
+            wrbuf_xmlputs(c->wrbuf, tname);
+            wrbuf_puts(c->wrbuf, "\">\n");
+            targets_termlist_nb(c->wrbuf, se, num, c->nmem);
+            wrbuf_puts(c->wrbuf, "</list>\n");
+        }
+    }
+    session_leave(se);
+    nmem_destroy(nmem_tmp);
+}
+
 #ifdef MISSING_HEADERS
 void report_nmem_stats(void)
 {
index fbb4e3c..342665e 100644 (file)
@@ -145,7 +145,7 @@ struct hitsbytarget {
     char *settings_xml;
 };
 
-struct hitsbytarget *hitsbytarget(struct session *s, int *count, NMEM nmem);
+struct hitsbytarget *get_hitsbytarget(struct session *s, int *count, NMEM nmem);
 struct session *new_session(NMEM nmem, struct conf_service *service,
                             unsigned session_id);
 void destroy_session(struct session *s);
@@ -179,6 +179,9 @@ int host_getaddrinfo(struct host *host, iochan_man_t iochan_man);
 int ingest_record(struct client *cl, const char *rec, int record_no, NMEM nmem);
 void session_alert_watch(struct session *s, int what);
 void add_facet(struct session *s, const char *type, const char *value, int count);
+
+void perform_termlist(struct http_channel *c, struct session *se,
+                      const char *name, int num);
 void session_log(struct session *s, int level, const char *fmt, ...)
 #ifdef __GNUC__
     __attribute__ ((format (printf, 3, 4)))
index 9741eb2..0b870bb 100644 (file)
@@ -147,8 +147,12 @@ void termlist_insert(struct termlist *tl, const char *display_term,
 
 static int compare(const void *s1, const void *s2)
 {
-    struct termlist_score **p1 = (struct termlist_score**) s1, **p2 = (struct termlist_score **) s2;
-    return (*p2)->frequency - (*p1)->frequency;
+    struct termlist_score **p1 = (struct termlist_score **) s1;
+    struct termlist_score **p2 = (struct termlist_score **) s2;
+    int d = (*p2)->frequency - (*p1)->frequency;
+    if (d)
+        return d;
+    return strcmp((*p1)->display_term, (*p2)->display_term);
 }
 
 struct termlist_score **termlist_highscore(struct termlist *tl, int *len)
index 3d10156..e2121e8 100644 (file)
@@ -1,16 +1,18 @@
 # 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 \
+EXTRA_DIST = run_pazpar2.sh marc21_test.xsl tmarc.xsl solr-pz2.xsl \
        z3950_indexdata_com_marc.xml \
        gils_service.xml marc_service.xml marc21.mmap \
-       test_http.cfg test_http.urls \
+       test_facets.cfg test_facets.urls \
        test_icu.cfg test_icu.urls \
+       test_http.cfg test_http.urls \
        test_post.cfg test_post.urls \
        test_settings.cfg test_settings.urls \
+       test_solr.cfg test_solr.urls \
        test_turbomarcxml.cfg test_turbomarcxml.urls \
-       test_facets.cfg test_facets.urls \
        $(check_SCRIPTS)
 
 TESTS = $(check_SCRIPTS)
@@ -19,6 +21,9 @@ MAINTAINERCLEANFILES = Makefile.in
 
 CONFIG_CLEAN_FILES=*.log *.dif
 
+clean-local:
+       rm -f *.log *.dif
+
 dist-hook:
        cp ${srcdir}/test_*.res $(distdir)
        mkdir $(distdir)/set2
index 2876a8b..299ff9f 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
-  <!-- Used by test_http.sh -->
+  <!-- Used by test_dads.sh -->
   <server>
     <listen port="9763"/>
     <proxy host="localhost"/>
index 77c902f..9fce24c 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
-  <!-- Used by test_http.sh -->
+  <!-- Used by test_facets.sh -->
   <server>
     <listen port="9763"/>
     <proxy host="localhost"/>
index a63c538..0a65480 100644 (file)
@@ -45,6 +45,4 @@
 <term><name>date8</name><frequency>20</frequency></term>
 <term><name>date9</name><frequency>10</frequency></term>
 </list>
-<list name="medium">
-</list>
 </termlist>
index 812c1c9..f9bb62c 100644 (file)
@@ -45,6 +45,4 @@
 <term><name>date8</name><frequency>20</frequency></term>
 <term><name>date9</name><frequency>10</frequency></term>
 </list>
-<list name="medium">
-</list>
 </termlist>
index abb5f68..babcb32 100644 (file)
@@ -45,6 +45,4 @@
 <term><name>date8</name><frequency>20</frequency></term>
 <term><name>date9</name><frequency>10</frequency></term>
 </list>
-<list name="medium">
-</list>
 </termlist>
index abb5f68..babcb32 100644 (file)
@@ -45,6 +45,4 @@
 <term><name>date8</name><frequency>20</frequency></term>
 <term><name>date9</name><frequency>10</frequency></term>
 </list>
-<list name="medium">
-</list>
 </termlist>
index a872155..859ee69 100644 (file)
 </list>
 <list name="author">
 <term><name>Jack Collins</name><frequency>2</frequency></term>
+<term><name>Englund, Carl R</name><frequency>1</frequency></term>
 <term><name>Mairs, John W</name><frequency>1</frequency></term>
 <term><name>Wood, Helen M</name><frequency>1</frequency></term>
-<term><name>Englund, Carl R</name><frequency>1</frequency></term>
 </list>
 <list name="subject">
-<term><name>Radioisotope scanning</name><frequency>1</frequency></term>
-<term><name>Scintillation cameras</name><frequency>1</frequency></term>
-<term><name>Imaging systems in medicine</name><frequency>1</frequency></term>
-<term><name>Bible. O.T</name><frequency>1</frequency></term>
 <term><name>Bible</name><frequency>1</frequency></term>
+<term><name>Bible. O.T</name><frequency>1</frequency></term>
 <term><name>Cartography</name><frequency>1</frequency></term>
-<term><name>Puget Sound region (Wash.)</name><frequency>1</frequency></term>
-<term><name>Tomography</name><frequency>1</frequency></term>
-<term><name>Optical pattern recognition</name><frequency>1</frequency></term>
 <term><name>Computers</name><frequency>1</frequency></term>
+<term><name>Imaging systems in medicine</name><frequency>1</frequency></term>
+<term><name>Optical pattern recognition</name><frequency>1</frequency></term>
+<term><name>Puget Sound region (Wash.)</name><frequency>1</frequency></term>
+<term><name>Radioisotope scanning</name><frequency>1</frequency></term>
 <term><name>Railroads</name><frequency>1</frequency></term>
+<term><name>Scintillation cameras</name><frequency>1</frequency></term>
+<term><name>Tomography</name><frequency>1</frequency></term>
 </list>
 <list name="date">
 <term><name>date0</name><frequency>100</frequency></term>
@@ -40,6 +40,4 @@
 <term><name>date8</name><frequency>20</frequency></term>
 <term><name>date9</name><frequency>10</frequency></term>
 </list>
-<list name="medium">
-</list>
 </termlist>
index 8230a4b..65e9fe2 100644 (file)
 <term><name>Mairs, John W</name><frequency>1</frequency></term>
 </list>
 <list name="subject">
-<term><name>Radioisotope scanning</name><frequency>1</frequency></term>
-<term><name>Scintillation cameras</name><frequency>1</frequency></term>
-<term><name>Imaging systems in medicine</name><frequency>1</frequency></term>
-<term><name>Bible. O.T</name><frequency>1</frequency></term>
 <term><name>Bible</name><frequency>1</frequency></term>
+<term><name>Bible. O.T</name><frequency>1</frequency></term>
 <term><name>Cartography</name><frequency>1</frequency></term>
+<term><name>Imaging systems in medicine</name><frequency>1</frequency></term>
+<term><name>Optical pattern recognition</name><frequency>1</frequency></term>
 <term><name>Puget Sound region (Wash.)</name><frequency>1</frequency></term>
+<term><name>Radioisotope scanning</name><frequency>1</frequency></term>
+<term><name>Scintillation cameras</name><frequency>1</frequency></term>
 <term><name>Tomography</name><frequency>1</frequency></term>
-<term><name>Optical pattern recognition</name><frequency>1</frequency></term>
 </list>
 <list name="date">
 <term><name>1974</name><frequency>2</frequency></term>
 <term><name>1977</name><frequency>2</frequency></term>
-<term><name>1980</name><frequency>1</frequency></term>
 <term><name>1973</name><frequency>1</frequency></term>
-</list>
-<list name="medium">
+<term><name>1980</name><frequency>1</frequency></term>
 </list>
 </termlist>
index 945d805..eb3828f 100644 (file)
@@ -56,8 +56,8 @@ http://localhost:9763/search.pz2?session=8&command=search&query=xyzzyz
 http://localhost:9763/search.pz2?session=8&command=search&query=a+and
 1 http://localhost:9763/search.pz2?session=8&command=show&block=1
 http://localhost:9763/search.pz2?command=init&pz:limitmap:author%5Bz3950.indexdata.com%2Fmarc%5D=ccl:author_phrase
-1 http://localhost:9763/search.pz2?session=9&command=search&query=greece&limit=author%3dadam\,+james
+1 http://localhost:9763/search.pz2?session=9&command=search&query=greece&limit=author%3dadam\,+james%7Cother_author
 1 http://localhost:9763/search.pz2?session=9&command=show&block=1
 http://localhost:9763/search.pz2?session=9&command=settings&pz:limitmap:author%5Bz3950.indexdata.com%2Fmarc%5D=rpn:%40attr+1%3d1003+%40attr+6%3d3
-1 http://localhost:9763/search.pz2?session=9&command=search&query=greece&limit=author%3dadam\,+james
+1 http://localhost:9763/search.pz2?session=9&command=search&query=greece&limit=author%3dadam\,+james%7Cother_author
 1 http://localhost:9763/search.pz2?session=9&command=show&block=1
index f343817..2febba8 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
-  <!-- Used by test_http.sh -->
+  <!-- Used by test_icu.sh -->
   <server>
     <listen port="9763"/>
     <proxy host="localhost"/>
index a200b10..b816997 100644 (file)
@@ -2,20 +2,20 @@
 <activeclients>0</activeclients>
 <list name="author">
 <term><name>Jack Collins</name><frequency>2</frequency></term>
+<term><name>Englund, Carl R.</name><frequency>1</frequency></term>
 <term><name>Mairs, John W.</name><frequency>1</frequency></term>
 <term><name>Wood, Helen M.</name><frequency>1</frequency></term>
-<term><name>Englund, Carl R.</name><frequency>1</frequency></term>
 </list>
 <list name="subject">
-<term><name>Radioisotope Scanning</name><frequency>1</frequency></term>
-<term><name>Scintillation Cameras</name><frequency>1</frequency></term>
-<term><name>Imaging Systems In Medicine</name><frequency>1</frequency></term>
 <term><name>Cartography</name><frequency>1</frequency></term>
-<term><name>Tomography</name><frequency>1</frequency></term>
-<term><name>Optical Pattern Recognition</name><frequency>1</frequency></term>
+<term><name>Community Colleges</name><frequency>1</frequency></term>
 <term><name>Computers</name><frequency>1</frequency></term>
+<term><name>Imaging Systems In Medicine</name><frequency>1</frequency></term>
+<term><name>Optical Pattern Recognition</name><frequency>1</frequency></term>
+<term><name>Radioisotope Scanning</name><frequency>1</frequency></term>
 <term><name>Railroads</name><frequency>1</frequency></term>
+<term><name>Scintillation Cameras</name><frequency>1</frequency></term>
+<term><name>Tomography</name><frequency>1</frequency></term>
 <term><name>Universities And Colleges</name><frequency>1</frequency></term>
-<term><name>Community Colleges</name><frequency>1</frequency></term>
 </list>
 </termlist>
index 77c902f..16425e2 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
-  <!-- Used by test_http.sh -->
+  <!-- Used by test_preferred.sh -->
   <server>
     <listen port="9763"/>
     <proxy host="localhost"/>
index cacd2c1..eb0c176 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
-  
+  <!-- Used by test_settings.sh -->  
   <server>
     <listen port="9763"/>
     <settings src="set2"/>
index c9ac3bd..1c30567 100644 (file)
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
-  <!-- Used by test_http.sh -->
+  <!-- Used by test_solr.sh -->
   <server>
     <listen port="9763"/>
-    <proxy host="localhost"/>
     
     <service>
-      <include src="z3950_indexdata_com_marc.xml"/>
       <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="test-usersetting-2" brief="yes"/>
     </service>
 
-    <include src="*_service.xml"/> 
-    <include src="no_such_service.xml"/>
-
   </server>
-  
-  
+
 </pazpar2>
 <!-- Keep this comment at the end of the file
      Local variables:
index 57c2842..1ce919e 100644 (file)
@@ -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%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%3Aoption_recordfilter%5Bocs-test.indexdata.com%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
+++ /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
+++ /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
+++ /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
+++ /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
+++ /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
+++ /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
+++ /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
+++ /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>
index b98d670..406581f 100644 (file)
-<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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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="ocs-test.indexdata.com/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>
index d3b889f..dd89fec 100644 (file)
@@ -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>ocs-test.indexdata.com/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 rights</name><frequency>6</frequency></term>
+<term><name>Water use</name><frequency>6</frequency></term>
+<term><name>Groundwater</name><frequency>4</frequency></term>
+<term><name>Hydrology</name><frequency>3</frequency></term>
+<term><name>Nutrient pollution of water</name><frequency>3</frequency></term>
+<term><name>Purification of</name><frequency>3</frequency></term>
+<term><name>Rural</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>Ambrose, David</name><frequency>1</frequency></term>
+<term><name>Bauer, Steve</name><frequency>1</frequency></term>
+<term><name>Bryan, Michelle</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>Dibdin, William Joseph</name><frequency>1</frequency></term>
+<term><name>Faeth, Paul</name><frequency>1</frequency></term>
+<term><name>Farnham, Henry P</name><frequency>1</frequency></term>
+<term><name>Fisher, D. E</name><frequency>1</frequency></term>
+<term><name>Frey, Hans</name><frequency>1</frequency></term>
+<term><name>Gingerich, Stephen B</name><frequency>1</frequency></term>
+<term><name>Glover, David</name><frequency>1</frequency></term>
+<term><name>Grant, Pamela</name><frequency>1</frequency></term>
+<term><name>Hochschwender, Ted</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>1996</name><frequency>3</frequency></term>
+<term><name>2001</name><frequency>3</frequency></term>
+<term><name>1896</name><frequency>2</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>1835</name><frequency>1</frequency></term>
+<term><name>1839</name><frequency>1</frequency></term>
+<term><name>1848</name><frequency>1</frequency></term>
+<term><name>1855</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
+++ /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
+++ /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
+++ /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
+++ /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>
index 60c3a81..6a42350 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
-  <!-- Used by test_http.sh -->
+  <!-- Used by test_sru-proxy.sh -->
   <server>
     <listen port="9763"/>
     <proxy host="localhost"/>
index 2876a8b..3b4413e 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
-  <!-- Used by test_http.sh -->
+  <!-- Used by test_sru.sh -->
   <server>
     <listen port="9763"/>
     <proxy host="localhost"/>
index 77c902f..8b5283a 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
-  <!-- Used by test_http.sh -->
+  <!-- Used by test_turbomarcxml.sh -->
   <server>
     <listen port="9763"/>
     <proxy host="localhost"/>
index 9de5198..22aa704 100644 (file)
@@ -4,7 +4,7 @@
 DEBUG=0   # 0 for release, 1 for debug
 USE_MANIFEST = 1 # Can be enabled Visual Studio 2005/2008
 PACKAGE_NAME=pazpar2
-PACKAGE_VERSION=1.6.2
+PACKAGE_VERSION=1.6.3
 
 # YAZ
 YAZ_DIR=..\..\yaz