Merge with master
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 19 Aug 2014 07:39:33 +0000 (09:39 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 19 Aug 2014 07:39:33 +0000 (09:39 +0200)
67 files changed:
IDMETA
NEWS
TODO [deleted file]
configure.ac
debian/changelog [deleted file]
doc/Makefile.am
doc/pazpar2_protocol.xml
etc/default.xml
etc/mkc.xml
etc/pazpar2.cfg.dist
etc/perf_server.cfg
etc/pz2.xsd
src/eventl.c
src/eventl.h
src/session.c
src/settings.c
test/Makefile.am
test/run_pazpar2.sh
test/test_cluster.urls
test/test_dads.urls
test/test_facets.urls
test/test_filter.urls
test/test_gbv_de.urls
test/test_http.urls
test/test_http_45.res
test/test_http_49.res
test/test_http_50.res
test/test_http_60.res
test/test_http_63.res
test/test_http_65.res
test/test_http_66.res
test/test_http_71.res
test/test_http_72.res
test/test_http_74.res
test/test_http_76.res
test/test_http_79.res
test/test_http_81.res
test/test_http_82.res
test/test_http_84.res
test/test_http_88.res
test/test_http_89.res
test/test_http_90.res
test/test_icu.urls
test/test_limit_limitmap.urls
test/test_perf.cfg [new file with mode: 0644]
test/test_perf.sh [new file with mode: 0755]
test/test_perf.urls [new file with mode: 0644]
test/test_perf_1.res [new file with mode: 0644]
test/test_perf_2.res [new file with mode: 0644]
test/test_perf_3.res [new file with mode: 0644]
test/test_perf_4.res [new file with mode: 0644]
test/test_perf_5.res [new file with mode: 0644]
test/test_post.urls
test/test_preferred.urls
test/test_rank.urls
test/test_settings.urls
test/test_solr.urls
test/test_solr_spell.urls
test/test_sort.urls
test/test_sort_6.res
test/test_sort_settings.xml
test/test_sru-proxy.urls
test/test_sru.urls
test/test_termlist_block.urls
test/test_turbomarcxml.urls
test/test_url.urls
win/makefile

diff --git a/IDMETA b/IDMETA
index c6330e9..420050a 100644 (file)
--- a/IDMETA
+++ b/IDMETA
@@ -1,4 +1,4 @@
 DEBIAN_DIST="jessie wheezy squeeze"
-UBUNTU_DIST="trusty saucy raring quantal precise oneiric"
+UBUNTU_DIST="trusty precise"
 CENTOS_DIST="centos5 centos6"
-VERSION=1.7.0
+VERSION=1.7.2
diff --git a/NEWS b/NEWS
index 6d9f270..610cba1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+--- 1.7.2 2014/08/18
+
+Fix hang for 2nd use of target with unresolved DNS PAZ-949
+
+--- 1.7.1 2014/08/14
+
+Use poll rather than select for main event loop to overcome limit of
+1024 file descriptors PAZ-947
+
+Override setting with same name (do not append) PAZ-945
+
 --- 1.7.0 2014/06/27
 
 Separate package: pazpar2-xsl PAZ-932
diff --git a/TODO b/TODO
deleted file mode 100644 (file)
index 6908b30..0000000
--- a/TODO
+++ /dev/null
@@ -1,15 +0,0 @@
-Short term: 
-
-(moved to Bugzilla)
-
-Longer term:
-
-Server-specific CCL-mapping (simple, follows from structured target profiles)
-Networked mechanism to control configuration
-Target selection by metadata -- 'subject', 'location', 'library
-       type' -- should be totally generic to support requirements of
-       different projects.
-Factor Z39.50 stuff out from pazpar2.c to separate file to make room for
-   later SRU implementation (essential if we do THDI or LOT. Not hard to do)
-
-Nice to have:
index 6fa9844..95defaf 100644 (file)
@@ -36,7 +36,7 @@ esac
 YAZ_DOC
 
 AC_SEARCH_LIBS([log],[m])
-AC_CHECK_HEADERS([sys/time.h sys/socket.h unistd.h netinet/in.h netdb.h arpa/inet.h])
+AC_CHECK_HEADERS([sys/time.h sys/socket.h unistd.h netdb.h])
 checkBoth=0
 AC_CHECK_FUNC([connect])
 if test "$ac_cv_func_connect" = "no"; then
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644 (file)
index 9db1ea6..0000000
+++ /dev/null
@@ -1,674 +0,0 @@
-pazpar2 (1.7.0-2.indexdata) unstable; urgency=medium
-
-  * Fix version passed to dpkg-maintscript-helper rm_conffile
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 27 Jun 2014 15:48:37 +0200
-
-pazpar2 (1.7.0-1.indexdata) unstable; urgency=medium
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 27 Jun 2014 15:02:50 +0200
-
-pazpar2 (1.6.41-1.indexdata) unstable; urgency=medium
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 23 Apr 2014 13:51:40 +0200
-
-pazpar2 (1.6.40-1.indexdata) unstable; urgency=medium
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 10 Apr 2014 15:28:09 +0200
-
-pazpar2 (1.6.39-1.indexdata) unstable; urgency=medium
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 19 Feb 2014 13:31:49 +0100
-
-pazpar2 (1.6.38-1.indexdata) unstable; urgency=medium
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 07 Jan 2014 13:56:01 +0100
-
-pazpar2 (1.6.37-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 18 Nov 2013 10:39:51 +0100
-
-pazpar2 (1.6.36-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 11 Nov 2013 13:59:08 +0100
-
-pazpar2 (1.6.35-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 23 Sep 2013 11:28:23 +0200
-
-pazpar2 (1.6.34-2indexdata) unstable; urgency=low
-
-  * Testing fix for #-suffix
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 02 Sep 2013 13:38:48 +0200
-
-pazpar2 (1.6.34-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 30 Aug 2013 13:45:14 +0200
-
-pazpar2 (1.6.33-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 13 Aug 2013 14:15:05 +0200
-
-pazpar2 (1.6.32-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 14 Jun 2013 10:50:14 +0200
-
-pazpar2 (1.6.31-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 24 May 2013 08:49:27 +0200
-
-pazpar2 (1.6.30-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 26 Apr 2013 11:16:59 +0200
-
-pazpar2 (1.6.29-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 05 Apr 2013 14:50:22 +0200
-
-pazpar2 (1.6.28-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 21 Mar 2013 10:57:39 +0100
-
-pazpar2 (1.6.27-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 08 Mar 2013 13:31:35 +0100
-
-pazpar2 (1.6.26-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 08 Mar 2013 12:23:36 +0100
-
-pazpar2 (1.6.25-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 07 Feb 2013 12:55:25 +0100
-
-pazpar2 (1.6.24-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 18 Jan 2013 14:29:01 +0100
-
-pazpar2 (1.6.23-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 02 Jan 2013 12:35:14 +0100
-
-pazpar2 (1.6.22-4indexdata) unstable; urgency=low
-
-  * Patch for blocked show problem.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 24 Dec 2012 11:36:31 +0100
-
-pazpar2 (1.6.22-3indexdata) unstable; urgency=low
-
-  * Testing filter on merged metadata.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 14 Dec 2012 17:23:39 +0100
-
-pazpar2 (1.6.22-2indexdata) unstable; urgency=low
-
-  * Testing diagnostics for timeout
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 11 Dec 2012 12:56:15 +0100
-
-pazpar2 (1.6.22-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 11 Oct 2012 09:50:32 +0200
-
-pazpar2 (1.6.21-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 24 Sep 2012 19:47:58 +0200
-
-pazpar2 (1.6.20-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 21 Sep 2012 15:11:59 +0200
-
-pazpar2 (1.6.19-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 18 Sep 2012 14:58:16 +0200
-
-pazpar2 (1.6.18-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 17 Sep 2012 13:05:14 +0200
-
-pazpar2 (1.6.17-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 05 Sep 2012 11:17:31 +0200
-
-pazpar2 (1.6.16-1indexdata) unstable; urgency=low
-
-  * Upstream
-
- -- Dennis Schafroth <dennis@indexdata.com>  Thu, 23 Aug 2012 16:00:33 +0200
-
-pazpar2 (1.6.15-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 27 Jun 2012 11:26:16 +0200
-
-pazpar2 (1.6.14-1indexdata) unstable; urgency=low
-
-  * Upstream
-
- -- Dennis Schafroth <dennis@indexdata.com>  Mon, 04 Jun 2012 12:10:08 +0200
-
-pazpar2 (1.6.13-1indexdata) unstable; urgency=low
-
-  * Upstream 
-
- -- Dennis Schafroth <dennis@indexdata.com>  Wed, 23 May 2012 12:24:57 +0000
-
-pazpar2 (1.6.12-1indexdata) unstable; urgency=low
-
-  * Upstream 
-
- -- Dennis Schafroth <dennis@indexdata.com>  Wed, 14 Mar 2012 11:22:57 +0000
-
-pazpar2 (1.6.11-1indexdata) unstable; urgency=low
-
-  * Upstream 
-
- -- Dennis Schafroth <dennis@indexdata.com>  Wed, 07 Mar 2012 11:24:13 +0000
-
-pazpar2 (1.6.10-1indexdata) unstable; urgency=low
-
-  * Upstream
-
- -- Dennis Schafroth <dennis@indexdata.com>  Thu, 23 Feb 2012 10:32:07 +0000
-
-pazpar2 (1.6.9-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 19 Jan 2012 15:31:44 +0100
-
-pazpar2 (1.6.8-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 17 Jan 2012 12:40:01 +0100
-
-pazpar2 (1.6.7-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 23 Dec 2011 13:33:17 +0100
-
-pazpar2 (1.6.6-3indexdata) unstable; urgency=low
-
-  * Local filtering
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 16 Dec 2011 13:44:43 +0100
-
-pazpar2 (1.6.6-2indexdata) unstable; urgency=low
-
-  * Testing
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 13 Dec 2011 14:39:42 +0100
-
-pazpar2 (1.6.6-1indexdata) unstable; urgency=low
-
-  * Upstream 
-
- -- Dennis Schafroth <dennis@indexdata.com>  Fri, 25 Nov 2011 13:53:24 +0000
-
-pazpar2 (1.6.5-1indexdata) unstable; urgency=low
-
-  * Upstream
-
- -- Dennis Schafroth <dennis@indexdata.com>  Tue, 01 Nov 2011 13:35:19 +0000
-
-pazpar2 (1.6.4-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 28 Oct 2011 12:19:50 +0200
-
-pazpar2 (1.6.3-2indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 27 Oct 2011 14:12:04 +0200
-
-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.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 15 Sep 2011 11:21:11 +0200
-
-pazpar2 (1.6.1-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 14 Sep 2011 14:21:35 +0200
-
-pazpar2 (1.6.0-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 12 Sep 2011 14:39:43 +0200
-
-pazpar2 (1.5.7-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 19 Aug 2011 13:29:58 +0200
-
-pazpar2 (1.5.6-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 15 Apr 2011 11:42:25 +0000
-
-pazpar2 (1.5.5-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 28 Mar 2011 15:42:06 +0200
-
-pazpar2 (1.5.3-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Dennis Schafroth <dennis@indexdata.com>  Fri, 18 Feb 2011 12:26:12 +0100
-
-pazpar2 (1.5.2-1indexdata) unstable; urgency=low
-
-  * Upstream
-
- -- Dennis Schafroth <dennis@indexdata.dk>  Tue, 18 Jan 2011 10:51:26 +0100
-
-pazpar2 (1.5.1-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Dennis Schafroth <dennis@indexdata.dk>  Thu, 06 Jan 2011 17:30:59 +0200
-
-pazpar2 (1.5.0-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 05 Oct 2010 12:43:59 +0200
-
-pazpar2 (1.4.4-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 17 Aug 2010 13:22:40 +0200
-
-pazpar2 (1.4.3-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 01 Jul 2010 14:04:10 +0200
-
-pazpar2 (1.4.2-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 18 Jun 2010 11:32:46 +0200
-
-pazpar2 (1.4.1-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 21 May 2010 14:56:46 +0200
-
-pazpar2 (1.4.0-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 29 Apr 2010 13:07:13 +0200
-
-pazpar2 (1.3.0-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 25 Jan 2010 10:39:26 +0100
-
-pazpar2 (1.2.4-2indexdata) karmic; urgency=low
-
-  * services-available/enabled structure.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 15 Jan 2010 13:29:58 +0100
-
-pazpar2 (1.2.4-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 15 Jan 2010 10:08:36 +0100
-
-pazpar2 (1.2.3-3indexdata) unstable; urgency=low
-
-  * Upstream: another interrim package.
-
- -- Mike Taylor <mike@miketaylor.org.uk>  Wed, 13 Jan 2010 15:31:12 +0000
-
-pazpar2 (1.2.3-2indexdata) unstable; urgency=low
-
-  * Upstream: interrim Debian package incorporating some of the changes
-    made between 1.2.3 and 1.2.4.
-
- -- Mike Taylor <mike@miketaylor.org.uk>  Wed, 13 Jan 2010 14:15:46 +0000
-
-pazpar2 (1.2.3-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 24 Nov 2009 12:22:52 +0100
-
-pazpar2 (1.2.2-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 13 Oct 2009 11:23:52 +0200
-
-pazpar2 (1.2.1-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 05 Oct 2009 09:48:43 +0200
-
-pazpar2 (1.2.0-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 10 Sep 2009 09:48:25 +0200
-
-pazpar2 (1.1.1-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 28 Aug 2009 14:37:35 +0200
-
-pazpar2 (1.1.0-1indexdata) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 19 Aug 2009 13:29:29 +0200
-
-pazpar2 (1.0.9-1) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 23 May 2008 12:08:51 +0200
-
-pazpar2 (1.0.8-1) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 22 Apr 2008 21:30:47 +0200
-
-pazpar2 (1.0.7-2) unstable; urgency=low
-
-  * Update NEWS.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 15 Apr 2008 08:53:29 +0200
-
-pazpar2 (1.0.7-1) unstable; urgency=low
-
-  * Marc21 stylesheet updated to reflect multiple full text fields
-
- -- Marc Cromme <marc@indexdata.dk>  Mon, 14 Apr 2008 14:06:53 +0200
-
-pazpar2 (1.0.6-1) unstable; urgency=low
-
-  * Wildcars in the target id can be used to apply settings to 
-    a group of targets
-  * Using yaz_deamon rather than pazpar2_process
-  * pz2.js: fixed IE compatibility issues (removed hasAttribues method calls)
-
- -- Jakub Skoczen <jakub@indexdata.dk>  Tue, 19 Feb 2008 15:09:55 +0100
-
-pazpar2 (1.0.5-3) unstable; urgency=low
-
-  * XML parsing in pz2.js rewritten to support multiple md elements of the
-    same type. Particular clients might require changes (MK tested).
-  * Changes to the pz2.js API - record method
-
- -- Jakub Skoczen <jakub@indexdata.dk>  Thu, 14 Feb 2008 14:32:55 +0100
-
-pazpar2 (1.0.5-2) unstable; urgency=low
-
-  * Work arounds/fixes for bugs #1634, #1858. 
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 09 Nov 2007 17:52:43 +0100
-
-pazpar2 (1.0.5-1) unstable; urgency=low
-
-  * prevented crashes in pz2js by testing for XML element children before
-    acessing data content. Fixed LOT2 bug #1811 
-
- -- Marc Cromme <marc@indexdata.dk>  Thu, 01 Nov 2007 12:05:51 +0100
-
-pazpar2 (1.0.4-4) unstable; urgency=low
-
-  * Added support for retrieval of records in binary.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue,  9 Oct 2007 07:48:08 +0200
-
-pazpar2 (1.0.4-3) unstable; urgency=low
-
-  * Fixed bug #1644, #1646. Refactor pz2.js code.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue,  2 Oct 2007 14:35:42 +0200
-
-pazpar2 (1.0.4-2) unstable; urgency=low
-
-  * Lower connect timeout.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 02 Oct 2007 10:39:37 +0200
-
-pazpar2 (1.0.4-1) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Fri, 28 Sep 2007 14:19:25 +0200
-
-pazpar2 (1.0.3-6) unstable; urgency=low
-
-  * HTTP fixes. Bugs #1639, #1665.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 26 Sep 2007 10:55:20 +0200
-
-pazpar2 (1.0.3-5) unstable; urgency=low
-
-  * More active client trickery. Bug #1628 again.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 20 Sep 2007 10:36:11 +0200
-
-pazpar2 (1.0.3-4) unstable; urgency=low
-
-  * Fixed bug #1628.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 20 Sep 2007 10:14:03 +0200
-
-pazpar2 (1.0.3-3) unstable; urgency=low
-
-  * Deal with bad hit counts.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 19 Sep 2007 15:23:04 +0200
-
-pazpar2 (1.0.3-2) unstable; urgency=low
-
-  * Terminate blocking show if active clients reaches zero.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 19 Sep 2007 14:55:45 +0200
-
-pazpar2 (1.0.3-1) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 19 Sep 2007 11:44:26 +0200
-
-pazpar2 (1.0.2-9) unstable; urgency=low
-
-  * ICU enabled by default for the Debian package.
-  * ICU for sorting.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 10 Sep 2007 10:44:03 +0200
-
-pazpar2 (1.0.2-8) unstable; urgency=low
-
-  * Bug fixes #1395, #1507.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 05 Sep 2007 10:41:31 +0200
-
-pazpar2 (1.0.2-7) unstable; urgency=low
-
-  * Fix pazpar2path setting so that empty string is allowed.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon,  3 Sep 2007 15:18:37 +0200
-
-pazpar2 (1.0.2-6) unstable; urgency=low
-
-  * Changes to enable pz2.js for proxying.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon,  3 Sep 2007 10:12:22 +0200
-
-pazpar2 (1.0.2-5) unstable; urgency=low
-
-  * Create a symlink rather than a file in /etc/apache2/conf.d .
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 22 Aug 2007 15:24:54 +0200
-
-pazpar2 (1.0.2-4) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 22 Aug 2007 11:54:48 +0200
-
-pazpar2 (1.0.2-3) unstable; urgency=low
-
-  * Includes fix of bug #1348.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 13 Aug 2007 14:12:50 +0200
-
-pazpar2 (1.0.2-2) unstable; urgency=low
-
-  * Sorting by year.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 23 Jul 2007 14:28:13 +0200
-
-pazpar2 (1.0.2-1) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 10 Jul 2007 11:10:47 +0200
-
-pazpar2 (1.0.1-1) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 03 Jul 2007 21:49:23 +0200
-
-pazpar2 (1.0.0-4) unstable; urgency=low
-
-  * Added logrotate file.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 03 Jul 2007 21:33:27 +0200
-
-pazpar2 (1.0.0-3) unstable; urgency=low
-
-  * Copy settings/*.xml to /etc/pazpar2/settings - including defaults.xml.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Thu, 28 Jun 2007 10:50:03 +0200
-
-pazpar2 (1.0.0-2) unstable; urgency=low
-
-  * Make /usr/share/pazpar2 available as /pazpar2 in pazpar2-apache.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 20 Jun 2007 15:37:26 +0200
-
-pazpar2 (1.0.0-1) unstable; urgency=low
-
-  * Upstream.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 20 Jun 2007 10:38:04 +0200
-
-pazpar2 (0.1-5) unstable; urgency=low
-
-  * File ap2pazpar2.cfg part of pazpar2-apache2.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Wed, 20 Jun 2007 07:54:52 +0200
-
-pazpar2 (0.1-4) unstable; urgency=low
-
-  * Added package pazpar2-apache2.
-  * Added package pazpar2-test1.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 19 Jun 2007 14:50:29 +0200
-
-pazpar2 (0.1-3) unstable; urgency=low
-
-  * Init Script LSB compliant. Pazpar2 in /usr/sbin/pazpar2.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 18 Jun 2007 15:43:36 +0200
-
-pazpar2 (0.1-2) unstable; urgency=low
-
-  * First version with start/stop script.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Mon, 18 Jun 2007 13:39:32 +0200
-
-pazpar2 (0.1-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Adam Dickmeiss <adam@indexdata.dk>  Sun, 17 Jun 2007 08:44:17 +0200
index f713e72..8061df2 100644 (file)
@@ -48,7 +48,7 @@ jade-check: $(XMLFILES)
        jade -E14 -D $(srcdir) -d common/print.dsl -t tex $(srcdir)/common/xml.dcl $(MAINXML)
        touch jade-check
 
-manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl
+manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl local.ent
        rm -f manref.xml
        for i in $(XMLMAN); do \
                xsltproc $(srcdir)/common/stripref.xsl $(srcdir)/$$i | sed 1d >> manref.xml; \
index 9586c3e..12ad723 100644 (file)
@@ -47,7 +47,7 @@
    <para>
     Initializes a session.
     Returns session ID to be used in subsequent requests. If
-    a server ID is given in the Pazpar2 server section, then a
+    a server ID is given in the Pazpar2 server section, then
     that is included in the session ID as suffix after a period (.).
    </para>
    <para>
index 66312dd..ec2f82d 100644 (file)
@@ -2,37 +2,37 @@
 <service  xmlns="http://www.indexdata.com/pazpar2/1.0">
   <timeout session="60" z3950_operation="30" z3950_session="180"/>
   <settings src="settings/testserver.xml"/>
-  
+
   <icu_chain id="relevance" locale="en">
     <transform rule="[:Control:] Any-Remove"/>
     <tokenize rule="l"/>
     <transform rule="[[:WhiteSpace:][:Punctuation:]`] Remove"/>
     <casemap rule="l"/>
   </icu_chain>
-  
+
   <icu_chain id="sort" locale="en">
     <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
     <casemap rule="l"/>
   </icu_chain>
-  
+
   <icu_chain id="mergekey" locale="en">
     <tokenize rule="l"/>
     <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
     <casemap rule="l"/>
   </icu_chain>
-  
+
   <icu_chain id="facet" locale="en">
     <display/>
     <transform rule="Title"/>
   </icu_chain>
-  
+
   <!-- we try to keep same order as in marc21.xsl -->
   <metadata name="id" brief="yes"/>
   <metadata name="lccn" merge="unique"/>
   <metadata name="isbn"/>
   <metadata name="issn"/>
   <metadata name="tech-rep-nr"/>
-  <metadata name="author" brief="yes" termlist="yes" merge="unique" 
+  <metadata name="author" brief="yes" termlist="yes" merge="unique"
            rank="2" mergekey="optional" limitmap="ccl: au" />
   <metadata name="author-title"/>
   <metadata name="author-date"/>
@@ -66,9 +66,9 @@
   <metadata name="physical-unittype"/>
   <metadata name="physical-unitsize"/>
   <metadata name="physical-specified"/>
-  
+
   <metadata name="series-title"/>
-  
+
   <metadata name="description" brief="yes" merge="unique" rank="3"/>
   <metadata name="subject-long" rank="3"/>
   <metadata name="subject" termlist="yes" rank="0" limitmap="ccl: su" />
@@ -87,7 +87,7 @@
   <metadata name="locallocation" brief="yes"/>
   <metadata name="callnumber" brief="yes"/>
   <metadata name="publicnote" brief="yes"/>
-  
+
   <!-- journals -->
   <metadata name="journal-title"/>
   <metadata name="journal-subpart"/>
   <metadata name="issue-date"/>
   <metadata name="issue-number"/>
   <metadata name="pages-number"/>
-  
+
   <metadata name="url_recipe" setting="postproc" brief="yes" merge="no"/>
   <metadata name="open_url_resolver" setting="parameter" merge="no"/>
   <metadata name="open-url" merge="longest"/>
   <metadata name="use_url_proxy" setting="postproc" brief="yes" merge="no"/>
-  
+
   <metadata name="publisher"/>
   <metadata name="available"/>
   <metadata name="due"/>
index 37d4484..2ab7cc4 100644 (file)
     <transform rule="[[:WhiteSpace:][:Punctuation:]`] Remove"/>
     <casemap rule="l"/>
   </icu_chain>
-  
+
   <icu_chain id="sort" locale="en">
     <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
     <casemap rule="l"/>
   </icu_chain>
-  
+
   <icu_chain id="mergekey" locale="en">
     <tokenize rule="l"/>
     <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
     <casemap rule="l"/>
   </icu_chain>
-  
+
   <icu_chain id="facet" locale="en">
     <display/>
     <transform rule="Title"/>
   </icu_chain>
-  
+
   <!-- we try to keep same order as in marc21.xsl -->
   <metadata name="id" brief="yes"/>
   <metadata name="lccn" merge="unique"/>
   <metadata name="isbn"/>
   <metadata name="issn"/>
   <metadata name="tech-rep-nr"/>
-  <metadata name="author" brief="yes" termlist="yes" merge="unique" 
+  <metadata name="author" brief="yes" termlist="yes" merge="unique"
            rank="20" mergekey="optional" limitmap="ccl: au" />
   <metadata name="author-title"/>
   <metadata name="author-date"/>
@@ -73,9 +73,9 @@
   <metadata name="physical-unittype"/>
   <metadata name="physical-unitsize"/>
   <metadata name="physical-specified"/>
-  
+
   <metadata name="series-title"/>
-  
+
   <metadata name="description" brief="yes" merge="longest" rank="3"/>
   <metadata name="subject-long" rank="3"/>
   <metadata name="subject" termlist="yes" rank="0" limitmap="ccl: su" />
@@ -94,7 +94,7 @@
   <metadata name="locallocation" brief="yes"/>
   <metadata name="callnumber" brief="yes"/>
   <metadata name="publicnote" brief="yes"/>
-  
+
   <!-- journals -->
   <metadata name="journal-title"/>
   <metadata name="journal-subpart"/>
   <metadata name="issue-date"/>
   <metadata name="issue-number"/>
   <metadata name="pages-number"/>
-  
+
   <metadata name="url_recipe" setting="postproc" brief="yes" merge="no"/>
   <metadata name="open_url_resolver" setting="parameter" merge="no"/>
   <metadata name="open-url" merge="longest"/>
   <metadata name="use_url_proxy" setting="postproc" brief="yes" merge="no"/>
-  
+
   <metadata name="publisher"/>
   <metadata name="available"/>
   <metadata name="due"/>
index 65dad25..4ec5b08 100644 (file)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
 
-  <file path=".:xsl"/>  
+  <file path=".:xsl"/>
   <server>
     <listen port="9004"/>
     <include src="default.xml"/>
   </server>
-  
+
 </pazpar2>
 <!-- Keep this comment at the end of the file
      Local variables:
index 943f639..05ff7bd 100644 (file)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
 
-  <file path=".:xsl"/> 
+  <file path=".:xsl"/>
   <threads number="10"/>
   <server id="metasearch_threaded">
-    <listen port="9005"/>
+    <listen port="9004"/>
     <include src="services/*.xml"/>
   </server>
-  
+
 </pazpar2>
 <!-- Keep this comment at the end of the file
      Local variables:
index c8bc6ba..6c2b785 100644 (file)
@@ -1,6 +1,6 @@
-<xs:schema 
-          attributeFormDefault="unqualified" 
-          elementFormDefault="qualified" 
+<xs:schema
+          attributeFormDefault="unqualified"
+          elementFormDefault="qualified"
           xmlns:pz="http://www.indexdata.com/pazpar2/1.0"
           targetNamespace="http://www.indexdata.com/pazpar2/1.0"
           xmlns:xs="http://www.w3.org/2001/XMLSchema"
index 8bc158b..1bcba5b 100644 (file)
 #include <stdio.h>
 #include <assert.h>
 
-#ifdef WIN32
-#include <winsock.h>
-#else
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 
 #include <stdlib.h>
 #include <errno.h>
@@ -74,15 +69,18 @@ static int iochan_use(int delta)
         no_iochans_total += delta;
     iochans = no_iochans;
     yaz_mutex_leave(g_mutex);
-    yaz_log(YLOG_DEBUG, "%s iochans=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), iochans);
+    yaz_log(YLOG_DEBUG, "%s iochans=%d",
+            delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), iochans);
     return iochans;
 }
 
-int  iochans_count(void) {
+int iochans_count(void)
+{
     return iochan_use(0);
 }
 
-int  iochans_count_total(void) {
+int iochans_count_total(void)
+{
     int total = 0;
     if (!g_mutex)
         return 0;
@@ -104,9 +102,12 @@ struct iochan_man_s {
     int no_threads;
     int log_level;
     YAZ_MUTEX iochan_mutex;
+    int size_fds;
+    struct yaz_poll_fd *fds;
 };
 
-iochan_man_t iochan_man_create(int no_threads) {
+iochan_man_t iochan_man_create(int no_threads)
+{
     iochan_man_t man = xmalloc(sizeof(*man));
     man->channel_list = 0;
     man->sel_thread = 0; /* can't create sel_thread yet because we may fork */
@@ -114,6 +115,8 @@ iochan_man_t iochan_man_create(int no_threads) {
     man->no_threads = no_threads;
     man->log_level = yaz_log_module_level("iochan");
     man->iochan_mutex = 0;
+    man->size_fds = 0;
+    man->fds = 0;
     yaz_mutex_create(&man->iochan_mutex);
     return man;
 }
@@ -128,8 +131,10 @@ IOCHAN iochan_destroy_real(IOCHAN chan)
     return next;
 }
 
-void iochan_man_destroy(iochan_man_t *mp) {
-    if (*mp) {
+void iochan_man_destroy(iochan_man_t *mp)
+{
+    if (*mp)
+    {
         IOCHAN c;
         if ((*mp)->sel_thread)
             sel_thread_destroy((*mp)->sel_thread);
@@ -138,16 +143,17 @@ void iochan_man_destroy(iochan_man_t *mp) {
         c = (*mp)->channel_list;
         (*mp)->channel_list = NULL;
         yaz_mutex_leave((*mp)->iochan_mutex);
-        while (c) {
+        while (c)
             c = iochan_destroy_real(c);
-        }
         yaz_mutex_destroy(&(*mp)->iochan_mutex);
+        xfree((*mp)->fds);
         xfree(*mp);
         *mp = 0;
     }
 }
 
-void iochan_add(iochan_man_t man, IOCHAN chan) {
+void iochan_add(iochan_man_t man, IOCHAN chan)
+{
     chan->man = man;
     yaz_mutex_enter(man->iochan_mutex);
     yaz_log(man->log_level, "iochan_add : chan=%p channel list=%p", chan,
@@ -157,7 +163,8 @@ void iochan_add(iochan_man_t man, IOCHAN chan) {
     yaz_mutex_leave(man->iochan_mutex);
 }
 
-IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name) {
+IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name)
+{
     IOCHAN new_iochan;
 
     if (!(new_iochan = (IOCHAN) xmalloc(sizeof(*new_iochan))))
@@ -175,7 +182,8 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name) {
     return new_iochan;
 }
 
-static void work_handler(void *work_data) {
+static void work_handler(void *work_data)
+{
     IOCHAN p = work_data;
 
     yaz_log(p->man->log_level, "eventl: work begin chan=%p name=%s event=%d",
@@ -194,90 +202,101 @@ static void work_handler(void *work_data) {
             p->name ? p->name : "", p->this_event);
 }
 
-static void run_fun(iochan_man_t man, IOCHAN p) {
-    if (man->sel_thread) {
+static void run_fun(iochan_man_t man, IOCHAN p)
+{
+    if (man->sel_thread)
+    {
         yaz_log(man->log_level,
                 "eventl: work add chan=%p name=%s event=%d", p,
                 p->name ? p->name : "", p->this_event);
         p->thread_users++;
         sel_thread_add(man->sel_thread, p);
-    } else
+    }
+    else
         work_handler(p);
 }
 
-static int event_loop(iochan_man_t man, IOCHAN *iochans) {
+static int event_loop(iochan_man_t man, IOCHAN *iochans)
+{
     do /* loop as long as there are active associations to process */
     {
         IOCHAN p, *nextp;
         IOCHAN start;
         IOCHAN inv_start;
-        fd_set in, out, except;
-        int res, max;
-        static struct timeval to;
-        struct timeval *timeout;
-
-//        struct yaz_poll_fd *fds;
+        int res;
+        struct yaz_poll_fd *fds;
         int i, no_fds = 0;
-        FD_ZERO(&in);
-        FD_ZERO(&out);
-        FD_ZERO(&except);
-        timeout = &to; /* hang on select */
-        to.tv_sec = 300;
-        to.tv_usec = 0;
-
-        // INV: start must no change through the loop
+        int connection_fired = 0;
+        int tv_sec = 300;
 
         yaz_mutex_enter(man->iochan_mutex);
         start = man->channel_list;
         yaz_mutex_leave(man->iochan_mutex);
         inv_start = start;
-        for (p = start; p; p = p->next) {
+        for (p = start; p; p = p->next)
+            no_fds++;
+        if (man->sel_fd != -1)
             no_fds++;
+        if (no_fds > man->size_fds)
+        {
+            man->size_fds = no_fds * 2;
+            man->fds = xrealloc(man->fds, man->size_fds * sizeof(*man->fds));
         }
-//        fds = (struct yaz_poll_fd *) xmalloc(no_fds * sizeof(*fds));
-
-        max = 0;
-        for (p = start; p; p = p->next) {
+        fds = man->fds;
+        i = 0;
+        if (man->sel_fd != -1)
+        {
+            fds[i].fd = man->sel_fd;
+            fds[i].input_mask = yaz_poll_read;
+            fds[i].client_data = 0;
+            i++;
+        }
+        for (p = start; p; p = p->next, i++)
+        {
+            p->poll_offset = i;
+            fds[i].client_data = p;
+            fds[i].fd = -1;
+            fds[i].input_mask = 0;
             if (p->thread_users > 0)
                 continue;
-            if (p->max_idle && p->max_idle < to.tv_sec)
-                to.tv_sec = p->max_idle;
+            if (p->max_idle && p->max_idle < tv_sec)
+                tv_sec = p->max_idle;
             if (p->fd < 0)
                 continue;
             if (p->flags & EVENT_INPUT)
-                FD_SET(p->fd, &in);
+                fds[i].input_mask |= yaz_poll_read;
             if (p->flags & EVENT_OUTPUT)
-                FD_SET(p->fd, &out);
+                fds[i].input_mask |= yaz_poll_write;
             if (p->flags & EVENT_EXCEPT)
-                FD_SET(p->fd, &except);
-            if (p->fd > max)
-                max = p->fd;
-        }
-        yaz_log(man->log_level, "max=%d sel_fd=%d", max, man->sel_fd);
-
-        if (man->sel_fd != -1) {
-            if (man->sel_fd > max)
-                max = man->sel_fd;
-            FD_SET(man->sel_fd, &in);
+                fds[i].input_mask |= yaz_poll_except;
+            if (fds[i].input_mask)
+                fds[i].fd = p->fd;
         }
-        yaz_log(man->log_level, "select begin nofds=%d", max);
-        res = select(max + 1, &in, &out, &except, timeout);
-        yaz_log(man->log_level, "select returned res=%d", res);
-        if (res < 0) {
+        yaz_log(man->log_level, "yaz_poll begin nofds=%d", no_fds);
+        res = yaz_poll(fds, no_fds, tv_sec, 0);
+        yaz_log(man->log_level, "yaz_poll returned res=%d", res);
+        if (res < 0)
+        {
             if (errno == EINTR)
                 continue;
-            else {
-                yaz_log(YLOG_ERRNO | YLOG_WARN, "select");
+            else
+            {
+                yaz_log(YLOG_ERRNO | YLOG_WARN, "poll");
                 return 0;
             }
         }
-        if (man->sel_fd != -1) {
-            if (FD_ISSET(man->sel_fd, &in)) {
+        if (man->sel_fd != -1)
+        {
+            i = 0;
+            assert(fds[i].fd == man->sel_fd);
+            if (fds[i].output_mask)
+            {
                 IOCHAN chan;
 
                 yaz_log(man->log_level, "eventl: sel input on sel_fd=%d",
                         man->sel_fd);
-                while ((chan = sel_thread_result(man->sel_thread))) {
+                while ((chan = sel_thread_result(man->sel_thread)))
+                {
                     yaz_log(man->log_level,
                             "eventl: got thread result chan=%p name=%s", chan,
                             chan->name ? chan->name : "");
@@ -285,68 +304,80 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) {
                 }
             }
         }
-        if (man->log_level) {
+        if (man->log_level)
+        {
             int no = 0;
-            for (p = start; p; p = p->next) {
+            for (p = start; p; p = p->next)
                 no++;
-            }
             yaz_log(man->log_level, "%d channels", no);
         }
-        i = 0;
-        for (p = start; p; p = p->next) {
+        for (p = start; p; p = p->next)
+        {
             time_t now = time(0);
+            i = p->poll_offset;
 
-            if (p->destroyed) {
+            if (p->destroyed)
+            {
                 yaz_log(man->log_level,
                         "eventl: skip destroyed chan=%p name=%s", p,
                         p->name ? p->name : "");
                 continue;
             }
-            if (p->thread_users > 0) {
+            if (p->thread_users > 0)
+            {
                 yaz_log(man->log_level,
                         "eventl: skip chan=%p name=%s users=%d", p,
                         p->name ? p->name : "", p->thread_users);
                 continue;
             }
             p->this_event = 0;
-
-            if (p->max_idle && now - p->last_event > p->max_idle) {
+            if (p->max_idle && now - p->last_event > p->max_idle)
+            {
                 p->last_event = now;
                 p->this_event |= EVENT_TIMEOUT;
             }
-            if (p->fd >= 0) {
-                if (FD_ISSET(p->fd, &in)) {
+            if (fds[i].fd >= 0 && p->fd == fds[i].fd)
+            {
+                if (fds[i].output_mask & yaz_poll_read)
+                {
                     p->last_event = now;
                     p->this_event |= EVENT_INPUT;
                 }
-                if (FD_ISSET(p->fd, &out)) {
+                if (fds[i].output_mask & yaz_poll_write)
+                {
                     p->last_event = now;
                     p->this_event |= EVENT_OUTPUT;
                 }
-                if (FD_ISSET(p->fd, &except)) {
+                if (fds[i].output_mask & yaz_poll_except)
+                {
                     p->last_event = now;
                     p->this_event |= EVENT_EXCEPT;
                 }
             }
             /* only fire one Z39.50/SRU socket event.. except for timeout */
-            if (p->this_event) {
+            if (p->this_event)
+            {
                 if (!(p->this_event & EVENT_TIMEOUT) &&
-                    !strcmp(p->name, "connection_socket")) {
+                    !strcmp(p->name, "connection_socket"))
+                {
                     /* not a timeout and we have a Z39.50/SRU socket */
-                    if (i == 0)
+                    if (connection_fired == 0)
                         run_fun(man, p);
-                    i++;
-                } else
+                    connection_fired++;
+                }
+                else
                     run_fun(man, p);
             }
         }
+
         assert(inv_start == start);
         yaz_mutex_enter(man->iochan_mutex);
-        for (nextp = iochans; *nextp;) {
+        for (nextp = iochans; *nextp; )
+        {
             IOCHAN p = *nextp;
-            if (p->destroyed && p->thread_users == 0) {
+            if (p->destroyed && p->thread_users == 0)
                 *nextp = iochan_destroy_real(p);
-            } else
+            else
                 nextp = &p->next;
         }
         yaz_mutex_leave(man->iochan_mutex);
@@ -354,8 +385,10 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) {
     return 0;
 }
 
-void iochan_man_events(iochan_man_t man) {
-    if (man->no_threads > 0 && !man->sel_thread) {
+void iochan_man_events(iochan_man_t man)
+{
+    if (man->no_threads > 0 && !man->sel_thread)
+    {
         man->sel_thread = sel_thread_create(work_handler, 0 /*work_destroy */,
                 &man->sel_fd, man->no_threads);
         yaz_log(man->log_level, "iochan_man_events. Using %d threads",
@@ -364,17 +397,6 @@ void iochan_man_events(iochan_man_t man) {
     event_loop(man, &man->channel_list);
 }
 
-void pazpar2_sleep(double d) {
-#ifdef WIN32
-    Sleep( (DWORD) (d * 1000));
-#else
-    struct timeval tv;
-    tv.tv_sec = floor(d);
-    tv.tv_usec = (d - floor(d)) * 1000000;
-    select(0, 0, 0, 0, &tv);
-#endif
-}
-
 /*
  * Local variables:
  * c-basic-offset: 4
index 5e46eca..92f9a53 100644 (file)
@@ -47,6 +47,7 @@ typedef struct iochan
     iochan_man_t man;
     char *name;
     struct iochan *next;
+    int poll_offset;
 } *IOCHAN;
 
 
@@ -69,8 +70,6 @@ void iochan_man_destroy(iochan_man_t *mp);
 
 IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name);
 
-void pazpar2_sleep(double d);
-
 #endif
 /*
  * Local variables:
index 17647d6..4e15246 100644 (file)
@@ -905,36 +905,38 @@ static struct session_database *find_session_database(struct session *se,
 }
 
 // Apply a session override to a database
-void session_apply_setting(struct session *se, char *dbname, char *setting,
+void session_apply_setting(struct session *se, char *dbname, char *name,
                            char *value)
 {
     struct session_database *sdb = find_session_database(se, dbname);
     struct conf_service *service = se->service;
-    struct setting *new = nmem_malloc(se->session_nmem, sizeof(*new));
-    int offset = settings_create_offset(service, setting);
+    struct setting *s;
+    int offset = settings_create_offset(service, name);
 
     expand_settings_array(&sdb->settings, &sdb->num_settings, offset,
                           se->session_nmem);
-    new->precedence = 0;
-    new->target = dbname;
-    new->name = setting;
-    new->value = value;
-    new->next = sdb->settings[offset];
-    sdb->settings[offset] = new;
-
-    se->settings_modified = 1;
 
     // Force later recompute of settings-driven data structures
     // (happens when a search starts and client connections are prepared)
-    switch (offset)
-    {
-    case PZ_XSLT:
-        if (sdb->map)
+    if (offset == PZ_XSLT)
+        sdb->map = 0;
+
+    se->settings_modified = 1;
+    for (s = sdb->settings[offset]; s; s = s->next)
+        if (!strcmp(s->name, name) &&
+            dbname && s->target && !strcmp(dbname, s->target))
         {
-            sdb->map = 0;
+            s->value = value;
+            return;
         }
-        break;
-    }
+    s = nmem_malloc(se->session_nmem, sizeof(*s));
+    s->precedence = 0;
+    s->target = dbname;
+    s->name = name;
+    s->value = value;
+    s->next = sdb->settings[offset];
+    sdb->settings[offset] = s;
+
 }
 
 void session_destroy(struct session *se)
index a17d094..ece8f04 100644 (file)
@@ -158,17 +158,24 @@ char *settings_name(struct conf_service *service, int offset)
 
 
 // Apply a session override to a database
-void service_apply_setting(struct conf_service *service, char *setting, char *value)
+void service_apply_setting(struct conf_service *service, char *name, char *value)
 {
-    struct setting *new = nmem_malloc(service->nmem, sizeof(*new));
-    int offset = settings_create_offset(service, setting);
+    struct setting *s;
+    int offset = settings_create_offset(service, name);
     expand_settings_array(&service->settings->settings, &service->settings->num_settings, offset, service->nmem);
-    new->precedence = 0;
-    new->target = NULL;
-    new->name = setting;
-    new->value = value;
-    new->next = service->settings->settings[offset];
-    service->settings->settings[offset] = new;
+    for (s = service->settings->settings[offset]; s; s = s->next)
+        if (!strcmp(s->name, name))
+        {
+            s->value = value;
+            return;
+        }
+    s = nmem_malloc(service->nmem, sizeof(*s));
+    s->precedence = 0;
+    s->target = NULL;
+    s->name = name;
+    s->value = value;
+    s->next = service->settings->settings[offset];
+    service->settings->settings[offset] = s;
 }
 
 
index f33c0b0..8976541 100644 (file)
@@ -4,7 +4,7 @@
 solr_tests = test_solr.sh test_termlist_block.sh test_limit_limitmap.sh test_sort.sh
 check_SCRIPTS = test_http.sh test_icu.sh test_post.sh \
  test_settings.sh test_turbomarcxml.sh test_facets.sh \
- test_url.sh test_filter.sh test_sru.sh \
+ test_url.sh test_filter.sh test_sru.sh test_perf.sh \
  $(solr_tests)
 
 EXTRA_DIST = run_pazpar2.sh marc21_test.xsl tmarc.xsl solr-pz2.xsl \
@@ -34,6 +34,7 @@ EXTRA_DIST = run_pazpar2.sh marc21_test.xsl tmarc.xsl solr-pz2.xsl \
        ztest_localhost_settings.xml test_termlist_block_settings_2.xml \
        test_facets_settings_1.xml test_facets_settings_2.xml \
        test_sru.cfg sru_service.xml \
+       test_perf.cfg \
        $(check_SCRIPTS)
 
 TESTS = $(check_SCRIPTS)
index ec9932d..1f4a94d 100755 (executable)
@@ -14,8 +14,10 @@ WAIT=120
 
 kill_pazpar2()
 {
-    if test -n "$PP2PID"; then
+    if test -z "$SKIP_PAZPAR2" -a -n "$PP2PID"; then
        kill $PP2PID
+       PP2PID=""
+       rm -f pazpar2.pid
     fi
     if test -f ztest.pid; then
        kill `cat ztest.pid`
@@ -145,8 +147,16 @@ else
     sec=1
     maxrounds=10
 fi
-LEVELS=loglevel,fatal,warn,log,debug,notime,zoom,zoomdetails
-if test -n "$PAZPAR2_USE_VALGRIND"; then
+LEVELS=loglevel,fatal,warn,log,debug,zoom,zoomdetails
+if test "$PERF_PROG"; then
+    eval $PERF_PROG ../src/pazpar2 -p pazpar2.pid -X -l ${PREFIX}_pazpar2.log -f ${srcdir}/${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
+    PP2PID=$!
+    sleep 5
+    if test -f pazpar2.pid; then
+       PP2PID=`cat pazpar2.pid`
+       echo "Got PID $PP2PID"
+    fi
+elif test -n "$PAZPAR2_USE_VALGRIND"; then
     valgrind --num-callers=30 --show-reachable=yes --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -v $LEVELS -X -l ${PREFIX}_pazpar2.log -f ${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
     PP2PID=$!
     sleep 0.01
@@ -216,10 +226,11 @@ for f in `cat ${srcdir}/${URLS}`; do
                    fi
                fi
            else
-               if test $rounds -eq 0; then
+               if test $testno -eq 1 -o $rounds -eq 0; then
                    echo "${PREFIX} $testno: Making for the first time"
                    mv $OUT2 $OUT1
                    code=1
+                   rounds=0
                fi
            fi
            if test $rounds -gt 0; then
@@ -229,8 +240,11 @@ for f in `cat ${srcdir}/${URLS}`; do
        testno=`expr $testno + 1`
        postfile=
        rounds=1
-    elif echo $f | grep '^[0-9]' >/dev/null; then
+    elif echo $f | grep '^w' >/dev/null; then
        rounds=$maxrounds
+    elif echo $f | grep '^[0-9]' >/dev/null; then
+       sleep $f
+       rounds=1
     else
        if test -f $srcdir/$f; then
            postfile=$srcdir/$f
@@ -249,7 +263,9 @@ for f in `cat ${srcdir}/${URLS}`; do
            else
                echo "${PREFIX} $testno: pazpar2 died"
            fi
-           exit 1
+           PP2PID=""
+           code=1
+           break
        fi
     fi
 done
@@ -263,15 +279,10 @@ if [ "$WAIT_PAZPAR2" ] ; then
     done
     echo "done"
 fi
-# Kill programs
-if test -f ztest.pid; then
-    kill `cat ztest.pid`
-    rm -f ztest.pid
-fi
-
-if [ -z "$SKIP_PAZPAR2" ] ; then
-    kill_pazpar2
-    sleep 2
+kill_pazpar2
+sleep 2
+if test "$PERF_PROG"; then
+    tail -3 ${PREFIX}_extra_pazpar2.log
 fi
 exit $code
 
index 6c772d5..3bc2510 100755 (executable)
@@ -1,9 +1,9 @@
 http://localhost:9763/search.pz2?command=init
 http://localhost:9763/search.pz2?session=1&command=search&query=1
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=2
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=3
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=4
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
index 48e1f57..d8db7aa 100644 (file)
@@ -1,7 +1,7 @@
 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
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+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
@@ -12,4 +12,4 @@ 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
\ No newline at end of file
+http://localhost:9763/search.pz2?session=2&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
index bf2924b..da84d76 100644 (file)
@@ -3,7 +3,7 @@ ztest_localhost_settings.xml http://localhost:9763/search.pz2?session=1&command=
 http://localhost:9763/search.pz2?session=1&command=search&query=7+and+computer
 http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=bytarget
-4 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium
+w http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium
 test_facets_settings_1.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=4+and+computer
 http://localhost:9763/search.pz2?session=1&command=show&block=1
@@ -15,13 +15,13 @@ http://localhost:9763/search.pz2?session=1&command=termlist
 http://localhost:9763/search.pz2?session=1&command=search&query=6+and+computer
 http://localhost:9763/search.pz2?session=1&command=show
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium
-10 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium
+w http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium
 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?command=init
 ztest_localhost_settings.xml http://localhost:9763/search.pz2?session=2&command=settings
 test_facets_settings_2.xml http://localhost:9763/search.pz2?session=2&command=settings
 http://localhost:9763/search.pz2?session=2&command=search&query=9+and+computer
-10 http://localhost:9763/search.pz2?session=2&command=show&block=1
+w http://localhost:9763/search.pz2?session=2&command=show&block=1
 http://localhost:9763/search.pz2?session=2&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium
 http://localhost:9763/search.pz2?session=2&command=search&query=9+and+computer
 http://localhost:9763/search.pz2?session=2&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cdate%2Cmedium
index 71014ee..fefe93b 100644 (file)
@@ -1,6 +1,6 @@
 http://localhost:9763/search.pz2?command=init
 http://localhost:9763/search.pz2?session=1&command=search&query=0+or+the
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=termlist&name=author,date,subject,xtargets
 http://localhost:9763/search.pz2?session=1&command=search&query=the%207&filter=pz%3Aid%3Dlocalhost%3A9999
 http://localhost:9763/search.pz2?session=1&command=show&block=1
index e0d8137..ad3e375 100644 (file)
@@ -1,7 +1,7 @@
 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
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+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
index b992bb4..7d98283 100644 (file)
@@ -2,7 +2,7 @@ http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%
 http://localhost:9763/search.pz2?session=1&command=stat
 http://localhost:9763/search.pz2?session=1&command=ping
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1&snippets=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&snippets=1
 http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+title+how+to+program+a+computer+author+jack+collins+medium+book&snippets=1
 http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0
 http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:0
@@ -15,52 +15,52 @@ http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1
 http://localhost:9763/search.pz2?command=init&clear=1
 http://localhost:9763/search.pz2?session=2&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=usmarc&pz:nativesyntax%23DUMMY%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fgils%23DUMMY%5D=marc21%5Ftest.xsl
 http://localhost:9763/search.pz2?session=2&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=2&command=show&block=1
+w http://localhost:9763/search.pz2?session=2&command=show&block=1
 http://localhost:9763/search.pz2?session=2&command=search&query=kubiak%20stanis%C5%82aw
 http://localhost:9763/search.pz2?session=2&command=search&query=kubiak%20sts%C5%82aw
-2 http://localhost:9763/search.pz2?session=2&command=bytarget
+w http://localhost:9763/search.pz2?session=2&command=bytarget
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-1 http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+title+how+to+program+a+computer+author+jack+collins+medium+book
+w http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+title+how+to+program+a+computer+author+jack+collins+medium+book
 http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0&binary=1
 http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+title+how+to+program+a+computer+author+jack+collins+medium+book&offset=0&binary=1&syntax=usmarc
 http://localhost:9763/search.pz2?command=init&service=gils
 http://localhost:9763/search.pz2?session=3&command=search&query=utah
-2 http://localhost:9763/search.pz2?session=3&command=show&block=1
+w http://localhost:9763/search.pz2?session=3&command=show&block=1
 http://localhost:9763/search.pz2?command=init&clear=1
 http://localhost:9763/search.pz2?session=4&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=marc21.mmap
 http://localhost:9763/search.pz2?session=4&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=4&command=show&block=1
+w http://localhost:9763/search.pz2?session=4&command=show&block=1
 http://localhost:9763/search.pz2?command=init
 http://localhost:9763/search.pz2?session=5&command=settings&pz:name%5Bz3950.indexdata.com%2Fmarc%5D=marc&pz:requestsyntax%5Bz3950.indexdata.com%2Fmarc%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fmarc%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fmarc%5D=marc21%5Ftest.xsl&pz:recordfilter%5Bz3950.indexdata.com%2Fmarc%5D=date
 http://localhost:9763/search.pz2?session=5&command=search&query=computer&filter=pz%3Aid%3Dz3950.indexdata.com%2Fmarc
-2 http://localhost:9763/search.pz2?session=5&command=show&block=1
+w http://localhost:9763/search.pz2?session=5&command=show&block=1
 http://localhost:9763/search.pz2?session=5&command=search&query=computer&filter=pz%3Aid%3Dunknown
 http://localhost:9763/search.pz2?session=3&command=settings&pz:maxrecs%5Bz3950.indexdata.com%2Fgils%5D=8
 http://localhost:9763/search.pz2?session=3&command=search&query=the
 http://localhost:9763/search.pz2?session=5&command=search&query=the&maxrecs=5&startrecs=2
-2 http://localhost:9763/search.pz2?session=3&command=show&block=1
+w http://localhost:9763/search.pz2?session=3&command=show&block=1
 http://localhost:9763/search.pz2?session=5&command=show&block=1
 http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F
-1 http://localhost:9763/search.pz2?session=6&command=search&query=louis
-1 http://localhost:9763/search.pz2?session=6&command=show&block=1
+w http://localhost:9763/search.pz2?session=6&command=search&query=louis
+w http://localhost:9763/search.pz2?session=6&command=show&block=1
 http://localhost:9763/search.pz2?session=6&command=record&id=content%3A+title+computer+processing+of+dynamic+images+from+an+anger+scintillation+camera+author+medium+book&offset=0&nativesyntax=txml%3Bcharset%3Dmarc-8
 http://localhost:9763/search.pz2?command=init&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F
 http://localhost:9763/search.pz2?session=7&command=search&query=greece
-1 http://localhost:9763/search.pz2?session=7&command=show&block=1&rank=title%3D9,author%3D7
-1 http://localhost:9763/search.pz2?session=6&command=show&block=1
+w http://localhost:9763/search.pz2?session=7&command=show&block=1&rank=title%3D9,author%3D7
+w http://localhost:9763/search.pz2?session=6&command=show&block=1
 http://localhost:9763/search.pz2?session=6&command=record&id=content%3A+title+computer+processing+of+dynamic+images+from+an+anger+scintillation+camera+author+medium+book&checksum=2614320583
 http://localhost:9763/search.pz2?command=init
 http://localhost:9763/search.pz2?session=8&command=settings&pz:name%5Bz3950.indexdata.com%2Fmarc%5D=marc&pz:requestsyntax%5Bz3950.indexdata.com%2Fmarc%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fmarc%5D=iso2709&pz:xslt%5Bz3950.indexdata.com%2Fmarc%5D=marc21%5Ftest.xsl&pz:recordfilter%5Bz3950.indexdata.com%2Fmarc%5D=date
 http://localhost:9763/search.pz2?session=8&command=search&query=xyzzyz
-2 http://localhost:9763/search.pz2?session=8&command=show&block=1
+w http://localhost:9763/search.pz2?session=8&command=show&block=1
 http://localhost:9763/search.pz2?session=8&command=search&query=a+AND
-1 http://localhost:9763/search.pz2?session=8&command=show&block=1
+w 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&pz:limitmap:Mysubject%5Bz3950.indexdata.com%2fmarc%5D=local:subject&pz:limitmap:date%5Bz3950.indexdata.com%2fmarc%5D=local:
-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
+w http://localhost:9763/search.pz2?session=9&command=search&query=greece&limit=author%3DAdam\,+James%7Cother_author
+w 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%7Cother_author
-1 http://localhost:9763/search.pz2?session=9&command=show&block=1
+w http://localhost:9763/search.pz2?session=9&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author
+w http://localhost:9763/search.pz2?session=9&command=show&block=1
 http://localhost:9763/search.pz2?session=9&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author&filter=pz%3Aid%3Dz3950.indexdata.com%2Fmarc
 1 http://localhost:9763/search.pz2?session=9&command=bytarget
 http://localhost:9763/search.pz2?session=9&command=show
index fa73966..2b2fb5b 100644 (file)
@@ -14,7 +14,7 @@
  <md-subject>Imaging systems in medicine</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
   <md-title-remainder>the proceedings of a workshop</md-title-remainder>
   <md-date>1974</md-date>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Radioisotope scanning</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Scintillation cameras</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Imaging systems in medicine</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>0</relevance>
index 9832043..4c1f533 100644 (file)
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>124766</relevance>
index fa73966..2b2fb5b 100644 (file)
@@ -14,7 +14,7 @@
  <md-subject>Imaging systems in medicine</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
   <md-title-remainder>the proceedings of a workshop</md-title-remainder>
   <md-date>1974</md-date>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Radioisotope scanning</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Scintillation cameras</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Imaging systems in medicine</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>0</relevance>
index 99b482c..298cdb2 100644 (file)
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>291121</relevance>
index 99b482c..298cdb2 100644 (file)
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>291121</relevance>
index b24d50f..efe653d 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bytarget><status>OK</status>
 <target><id>z3950.indexdata.com/marc</id>
-<name>Index Data MARC test server</name>
+<name>marc</name>
 <hits>1</hits>
 <diagnostic>0</diagnostic>
 <records>1</records>
index 99b482c..298cdb2 100644 (file)
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>291121</relevance>
index b24d50f..efe653d 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bytarget><status>OK</status>
 <target><id>z3950.indexdata.com/marc</id>
-<name>Index Data MARC test server</name>
+<name>marc</name>
 <hits>1</hits>
 <diagnostic>0</diagnostic>
 <records>1</records>
index 99b482c..298cdb2 100644 (file)
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>291121</relevance>
index a105782..698a09e 100644 (file)
@@ -13,7 +13,7 @@
  <md-subject>Railroads</md-subject>
  <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4007858895">
+    name="marc" checksum="4007858895">
   <md-title>Washington metropolitan area rail computer feasibility study;</md-title>
   <md-title-remainder>final report</md-title-remainder>
   <md-date>1971</md-date>
@@ -23,9 +23,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Railroads</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>59412</relevance>
index 4d7509d..ad132e9 100644 (file)
@@ -11,7 +11,7 @@
  <md-date>1977</md-date>
  <md-subject>Optical pattern recognition</md-subject>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3659474317">
+    name="marc" checksum="3659474317">
   <md-title>Computer science &amp; technology</md-title>
   <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
   <md-date>1977</md-date>
@@ -19,9 +19,6 @@
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Optical pattern recognition</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>102165</relevance>
@@ -43,7 +40,7 @@ score = relevance(102165);
  <md-subject>Bible</md-subject>
  <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3136897450">
+    name="marc" checksum="3136897450">
   <md-title>The Computer Bible</md-title>
   <md-date>1973-1980</md-date>
   <md-subject>Bible. O.T</md-subject>
@@ -73,7 +70,7 @@ score = relevance(102165);
  <md-author>Wood, Helen M</md-author>
  <md-subject>Computers</md-subject>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3833666606">
+    name="marc" checksum="3833666606">
   <md-title>The use of passwords for controlled access to computer resources</md-title>
   <md-date>1977</md-date>
   <md-author>Wood, Helen M</md-author>
@@ -81,9 +78,6 @@ score = relevance(102165);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Computers</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>30649</relevance>
@@ -105,7 +99,7 @@ score = relevance(30649);
  <md-subject>Tomography</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3485282028">
+    name="marc" checksum="3485282028">
   <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine</md-title>
   <md-title-remainder>proceedings of the workshop</md-title-remainder>
   <md-date>1977</md-date>
@@ -114,9 +108,6 @@ score = relevance(30649);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Tomography</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>0</relevance>
index ced6941..3bbbe07 100644 (file)
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>60819</relevance>
@@ -53,7 +47,7 @@ score = relevance(60819);
  <md-author>Smith, George Adam</md-author>
  <md-subject>Bible</md-subject>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2788512872">
+    name="marc" checksum="2788512872">
   <md-title>Four psalms</md-title>
   <md-title-remainder>XXIII, XXXVI, LII, CXXI</md-title-remainder>
   <md-date>1980</md-date>
index ace9c5e..4633a6c 100644 (file)
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>48655</relevance>
@@ -56,7 +50,7 @@ score = relevance(48655);
  <md-subject>Federal aid to education</md-subject>
  <md-description>&quot;This directory was developed by the Technology for the National Diffusion Network Project, Teachers College, Columbia University pursuant to contract number OE-300-83-0253, U.S. Department of Education&quot;--T.p. verso</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2788512872">
+    name="marc" checksum="2788512872">
   <md-title>Technology programs that work</md-title>
   <md-date>1984</md-date>
   <md-subject>United States</md-subject>
@@ -70,12 +64,6 @@ score = relevance(48655);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Educational technology</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Federal aid to education</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>4054</relevance>
index fa5a350..d7bc82b 100644 (file)
@@ -18,7 +18,7 @@
 <list name="xtargets">
 <term>
 <id>z3950.indexdata.com/marc</id>
-<name>Index Data MARC test server</name>
+<name>marc</name>
 <frequency>2</frequency>
 <state>Client_Idle</state>
 <diagnostic>0</diagnostic>
index 4f857e5..530d935 100644 (file)
@@ -14,7 +14,7 @@
  <md-subject>Greece</md-subject>
  <md-description>Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>The religious teachers of Greece</md-title>
   <md-date>1972</md-date>
   <md-author>Adam, James</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Greek literature</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Philosophy, Ancient</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>48655</relevance>
index ced51fb..890a78d 100644 (file)
@@ -9,7 +9,7 @@
  <md-title>How to program a computer</md-title>
  <md-author>Jack Collins</md-author>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
@@ -17,7 +17,7 @@
         YYYYYYYYY</md-test-usersetting-2>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2788512872">
+    name="marc" checksum="2788512872">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
@@ -46,7 +46,7 @@ score = relevance(48160);
  <md-date>1977</md-date>
  <md-subject>Optical pattern recognition</md-subject>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3659474317">
+    name="marc" checksum="3659474317">
   <md-title>Computer science &amp; technology</md-title>
   <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
   <md-date>1977</md-date>
@@ -54,9 +54,6 @@ score = relevance(48160);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Optical pattern recognition</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>40134</relevance>
@@ -78,7 +75,7 @@ score = relevance(40134);
  <md-subject>Bible</md-subject>
  <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3136897450">
+    name="marc" checksum="3136897450">
   <md-title>The Computer Bible</md-title>
   <md-date>1973-1980</md-date>
   <md-subject>Bible. O.T</md-subject>
@@ -109,7 +106,7 @@ score = relevance(40134);
  <md-subject>Community colleges</md-subject>
  <md-description>Cover title</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4182051184">
+    name="marc" checksum="4182051184">
   <md-title>A plan for community college computer development</md-title>
   <md-date>1971</md-date>
   <md-subject>Universities and colleges</md-subject>
@@ -118,12 +115,6 @@ score = relevance(40134);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Universities and colleges</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Community colleges</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>17200</relevance>
@@ -146,7 +137,7 @@ score = relevance(17200);
  <md-subject>Railroads</md-subject>
  <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4007858895">
+    name="marc" checksum="4007858895">
   <md-title>Washington metropolitan area rail computer feasibility study;</md-title>
   <md-title-remainder>final report</md-title-remainder>
   <md-date>1971</md-date>
@@ -156,9 +147,6 @@ score = relevance(17200);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Railroads</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>17200</relevance>
@@ -182,7 +170,7 @@ score = relevance(17200);
  <md-subject>Puget Sound region (Wash.)</md-subject>
  <md-description>Scale of maps ca. 1:1,000,000</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3311089739">
+    name="marc" checksum="3311089739">
   <md-title>The Puget Sound Region</md-title>
   <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
   <md-date>1974</md-date>
@@ -194,9 +182,6 @@ score = relevance(17200);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Cartography</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>16722</relevance>
@@ -220,7 +205,7 @@ score = relevance(16722);
  <md-subject>Imaging systems in medicine</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2962705161">
+    name="marc" checksum="2962705161">
   <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
   <md-title-remainder>the proceedings of a workshop</md-title-remainder>
   <md-date>1974</md-date>
@@ -231,15 +216,6 @@ score = relevance(16722);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Radioisotope scanning</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Scintillation cameras</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Imaging systems in medicine</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>12040</relevance>
@@ -260,7 +236,7 @@ score = relevance(12040);
  <md-author>Wood, Helen M</md-author>
  <md-subject>Computers</md-subject>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3833666606">
+    name="marc" checksum="3833666606">
   <md-title>The use of passwords for controlled access to computer resources</md-title>
   <md-date>1977</md-date>
   <md-author>Wood, Helen M</md-author>
@@ -268,9 +244,6 @@ score = relevance(12040);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Computers</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>12040</relevance>
@@ -292,7 +265,7 @@ score = relevance(12040);
  <md-subject>Tomography</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3485282028">
+    name="marc" checksum="3485282028">
   <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine</md-title>
   <md-title-remainder>proceedings of the workshop</md-title-remainder>
   <md-date>1977</md-date>
@@ -301,9 +274,6 @@ score = relevance(12040);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Tomography</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>0</relevance>
index 9bb5d30..b91efcb 100644 (file)
@@ -17,7 +17,7 @@
  <md-subject>Community colleges</md-subject>
  <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3659474317">
+    name="marc" checksum="3659474317">
   <md-title>Computer science &amp; technology</md-title>
   <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
   <md-date>1977</md-date>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Optical pattern recognition</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3833666606">
+    name="marc" checksum="3833666606">
   <md-title>The use of passwords for controlled access to computer resources</md-title>
   <md-date>1977</md-date>
   <md-author>Wood, Helen M</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Computers</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4007858895">
+    name="marc" checksum="4007858895">
   <md-title>Washington metropolitan area rail computer feasibility study;</md-title>
   <md-title-remainder>final report</md-title-remainder>
   <md-date>1971</md-date>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Railroads</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4182051184">
+    name="marc" checksum="4182051184">
   <md-title>A plan for community college computer development</md-title>
   <md-date>1971</md-date>
   <md-subject>Universities and colleges</md-subject>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Universities and colleges</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Community colleges</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>4</count>
  <relevance>41119</relevance>
@@ -111,7 +96,7 @@ score = relevance(41119);
  <md-subject>Tomography</md-subject>
  <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2962705161">
+    name="marc" checksum="2962705161">
   <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
   <md-title-remainder>the proceedings of a workshop</md-title-remainder>
   <md-date>1974</md-date>
@@ -122,18 +107,9 @@ score = relevance(41119);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Radioisotope scanning</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Scintillation cameras</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Imaging systems in medicine</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3136897450">
+    name="marc" checksum="3136897450">
   <md-title>The Computer Bible</md-title>
   <md-date>1973-1980</md-date>
   <md-subject>Bible. O.T</md-subject>
@@ -145,7 +121,7 @@ score = relevance(41119);
         YYYYYYYYY</md-test-usersetting-2>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3311089739">
+    name="marc" checksum="3311089739">
   <md-title>The Puget Sound Region</md-title>
   <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
   <md-date>1974</md-date>
@@ -157,12 +133,9 @@ score = relevance(41119);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Cartography</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3485282028">
+    name="marc" checksum="3485282028">
   <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine</md-title>
   <md-title-remainder>proceedings of the workshop</md-title-remainder>
   <md-date>1977</md-date>
@@ -171,9 +144,6 @@ score = relevance(41119);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Tomography</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>4</count>
  <relevance>32723</relevance>
@@ -198,7 +168,7 @@ score = relevance(32723);
  <md-title>How to program a computer</md-title>
  <md-author>Jack Collins</md-author>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
@@ -222,7 +192,7 @@ score = relevance(11437);
  <md-title>How to program a computer</md-title>
  <md-author>Jack Collins</md-author>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2788512872">
+    name="marc" checksum="2788512872">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
index 480b05e..86487ca 100644 (file)
@@ -9,7 +9,7 @@
  <md-title>How to program a computer</md-title>
  <md-author>Jack Collins</md-author>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="marc" checksum="2614320583">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
@@ -17,7 +17,7 @@
         YYYYYYYYY</md-test-usersetting-2>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2788512872">
+    name="marc" checksum="2788512872">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
@@ -46,7 +46,7 @@ score = relevance(48160);
  <md-date>1977</md-date>
  <md-subject>Optical pattern recognition</md-subject>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3659474317">
+    name="marc" checksum="3659474317">
   <md-title>Computer science &amp; technology</md-title>
   <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
   <md-date>1977</md-date>
@@ -54,9 +54,6 @@ score = relevance(48160);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Optical pattern recognition</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>40134</relevance>
@@ -78,7 +75,7 @@ score = relevance(40134);
  <md-subject>Bible</md-subject>
  <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3136897450">
+    name="marc" checksum="3136897450">
   <md-title>The Computer Bible</md-title>
   <md-date>1973-1980</md-date>
   <md-subject>Bible. O.T</md-subject>
@@ -109,7 +106,7 @@ score = relevance(40134);
  <md-subject>Community colleges</md-subject>
  <md-description>Cover title</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4182051184">
+    name="marc" checksum="4182051184">
   <md-title>A plan for community college computer development</md-title>
   <md-date>1971</md-date>
   <md-subject>Universities and colleges</md-subject>
@@ -118,12 +115,6 @@ score = relevance(40134);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Universities and colleges</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Community colleges</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>17200</relevance>
@@ -146,7 +137,7 @@ score = relevance(17200);
  <md-subject>Railroads</md-subject>
  <md-description>&quot;Contract DOT-UT-10003.&quot;</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="4007858895">
+    name="marc" checksum="4007858895">
   <md-title>Washington metropolitan area rail computer feasibility study;</md-title>
   <md-title-remainder>final report</md-title-remainder>
   <md-date>1971</md-date>
@@ -156,9 +147,6 @@ score = relevance(17200);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Railroads</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>17200</relevance>
@@ -182,7 +170,7 @@ score = relevance(17200);
  <md-subject>Puget Sound region (Wash.)</md-subject>
  <md-description>Scale of maps ca. 1:1,000,000</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3311089739">
+    name="marc" checksum="3311089739">
   <md-title>The Puget Sound Region</md-title>
   <md-title-remainder>a portfolio of thematic computer maps</md-title-remainder>
   <md-date>1974</md-date>
@@ -194,9 +182,6 @@ score = relevance(17200);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Cartography</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>16722</relevance>
@@ -220,7 +205,7 @@ score = relevance(16722);
  <md-subject>Imaging systems in medicine</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2962705161">
+    name="marc" checksum="2962705161">
   <md-title>Computer processing of dynamic images from an Anger scintillation camera</md-title>
   <md-title-remainder>the proceedings of a workshop</md-title-remainder>
   <md-date>1974</md-date>
@@ -231,15 +216,6 @@ score = relevance(16722);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Radioisotope scanning</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Scintillation cameras</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
-  <md-subjects>Imaging systems in medicine</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>12040</relevance>
@@ -260,7 +236,7 @@ score = relevance(12040);
  <md-author>Wood, Helen M</md-author>
  <md-subject>Computers</md-subject>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3833666606">
+    name="marc" checksum="3833666606">
   <md-title>The use of passwords for controlled access to computer resources</md-title>
   <md-date>1977</md-date>
   <md-author>Wood, Helen M</md-author>
@@ -268,9 +244,6 @@ score = relevance(12040);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Computers</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>12040</relevance>
@@ -292,7 +265,7 @@ score = relevance(12040);
  <md-subject>Tomography</md-subject>
  <md-description>Includes bibliographical references and index</md-description>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="3485282028">
+    name="marc" checksum="3485282028">
   <md-title>Reconstruction tomography in diagnostic radiology and nuclear medicine</md-title>
   <md-title-remainder>proceedings of the workshop</md-title-remainder>
   <md-date>1977</md-date>
@@ -301,9 +274,6 @@ score = relevance(12040);
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
   <md-test-usersetting-2>test-usersetting-2 data: 
         YYYYYYYYY</md-test-usersetting-2>
-  <md-subjects>Tomography</md-subjects>
-  <md-subjects>PAZPAR2_NULL_b</md-subjects>
-  <md-subjects>PAZPAR2_NULL_c</md-subjects>
  </location>
  <count>1</count>
  <relevance>0</relevance>
index be4e983..fefa859 100644 (file)
@@ -1,7 +1,7 @@
 http://localhost:9763/search.pz2?command=init
 http://localhost:9763/search.pz2?session=1&command=stat
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:0&snippets=1
+w http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:0&snippets=1
 http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=title:1
 http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:0
 http://localhost:9763/search.pz2?session=1&command=show&start=0&number=1&sort=date:1
index 1e263ad..df671c9 100644 (file)
@@ -1,39 +1,39 @@
 test_limit_limitmap_service.xml http://localhost:9763/search.pz2?command=init&service=limitmap
 test_limit_limitmap_settings_1.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+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&block=1&name=xtargets%2Cauthor%2Csubject%2Cdate
 test_limit_limitmap_settings_2.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-10 http://localhost:9763/search.pz2?session=1&command=show&block=1
+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&block=1&name=xtargets%2Cauthor%2Csubject%2Cdate
 http://localhost:9763/search.pz2?session=1&command=termlist&block=1&report=status&name=xtargets%2Cauthor%2Csubject%2Cdate
 http://localhost:9763/search.pz2?session=1&command=bytarget&report=status
-1 http://localhost:9763/search.pz2?session=1&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 test_limit_limitmap_settings_3.xml http://localhost:9763/search.pz2?session=1&command=settings
-1 http://localhost:9763/search.pz2?session=1&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=greece&limit=author%3Dadam\,+james%7Cother_author&filter=pz%3Aid%3DTarget-1
 1 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?session=1&command=show
 test_limit_limitmap_settings_4.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=Mysubject%3DRailroads
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=date%3D1977
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=Mysubject%3DRailroads
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=date%3D1977
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
 http://localhost:9763/search.pz2?session=1&command=termlist&block=1&version2=
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=date%3C1977
 http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
 http://localhost:9763/search.pz2?session=1&command=termlist&block=1&version=2
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=date%3D1977-1997
-1 http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
 http://localhost:9763/search.pz2?session=1&command=termlist&block=1&version2=
 http://localhost:9763/search.pz2?session=1&command=search&query=computer&limit=date%3C1977
 http://localhost:9763/search.pz2?session=1&command=show&block=1&version=2
diff --git a/test/test_perf.cfg b/test/test_perf.cfg
new file mode 100644 (file)
index 0000000..d2fa501
--- /dev/null
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
+  <!-- Used by test_facets.sh -->
+  <server>
+    <listen port="9763"/>
+    <proxy host="localhost"/>
+
+    <!-- character set mapping.. This can be overriden in services -->
+    <icu_chain id="relevance" locale="en">
+      <transform rule="[:Control:] Any-Remove"/>
+      <tokenize rule="l"/>
+      <transform rule="[[:WhiteSpace:][:Punctuation:]`] Remove"/>
+      <casemap rule="l"/>
+    </icu_chain>
+    
+    <icu_chain id="sort" locale="en">
+      <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
+      <casemap rule="l"/>
+    </icu_chain>
+    
+    <icu_chain id="mergekey" locale="en">
+      <tokenize rule="l"/>
+      <transform rule="[[:Control:][:WhiteSpace:][:Punctuation:]`] Remove"/>
+      <casemap rule="l"/>
+    </icu_chain>
+
+    <!-- default rule if not facetrule is defined on meta-data element -->
+    <icu_chain id="facet" locale="en">
+      <transliterate>[[:WhiteSpace:][,.-]]* } [$] > ;</transliterate>
+    </icu_chain>
+    
+    <icu_chain id="punctuation-trim" locale="en">
+      <transliterate>[[:WhiteSpace:][,.-]]* } [$] > ;</transliterate>
+    </icu_chain>
+
+    <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" facetrule="punctuation-trim" />
+      <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"/>
+    </service>
+  </server>
+  
+  
+</pazpar2>
+<!-- Keep this comment at the end of the file
+     Local variables:
+     mode: nxml
+     End:
+-->
diff --git a/test/test_perf.sh b/test/test_perf.sh
new file mode 100755 (executable)
index 0000000..c6fd22c
--- /dev/null
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+TEST=`basename $0 .sh`
+# srcdir might be set by make
+srcdir=${srcdir:-"."}
+
+if test -z "$PERF_PROG"; then
+    if test -x /usr/bin/time; then
+        PERF_PROG="/usr/bin/time -p"
+    fi
+fi
+exec ${srcdir}/run_pazpar2.sh --ztest --icu $TEST
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation: 2
+# sh-basic-offset: 4
+# End:
diff --git a/test/test_perf.urls b/test/test_perf.urls
new file mode 100644 (file)
index 0000000..7b23363
--- /dev/null
@@ -0,0 +1,5 @@
+http://localhost:9763/search.pz2?command=init&clear=1
+ztest_localhost_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
+http://localhost:9763/search.pz2?session=1&command=search&query=100+and+computer
+2 w http://localhost:9763/search.pz2?session=1&command=show&block=1
+http://localhost:9763/search.pz2?session=1&command=termlist
diff --git a/test/test_perf_1.res b/test/test_perf_1.res
new file mode 100644 (file)
index 0000000..c09ee34
--- /dev/null
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<init><status>OK</status><session>1</session><protocol>1</protocol><keepAlive>50000</keepAlive>
+</init>
\ No newline at end of file
diff --git a/test/test_perf_2.res b/test/test_perf_2.res
new file mode 100644 (file)
index 0000000..42534e3
--- /dev/null
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings><status>OK</status></settings>
\ No newline at end of file
diff --git a/test/test_perf_3.res b/test/test_perf_3.res
new file mode 100644 (file)
index 0000000..ab63fe6
--- /dev/null
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<search><status>OK</status></search>
\ No newline at end of file
diff --git a/test/test_perf_4.res b/test/test_perf_4.res
new file mode 100644 (file)
index 0000000..dc992a3
--- /dev/null
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<show><status>OK</status>
+<activeclients>0</activeclients>
+<merged>99</merged>
+<total>100</total>
+<start>0</start>
+<num>20</num>
+<hit>
+ <md-title>Internet world</md-title>
+ <md-date>1992</md-date>
+ <md-description>Title from caption</md-description>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="2093092631">
+  <md-title>Internet world</md-title>
+  <md-date>1992</md-date>
+  <md-description>Title from caption</md-description>
+ </location>
+ <count>1</count>
+ <relevance>55113</relevance>
+ <recid>content: title internet world</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack Collins</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="75373906">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack Collins</md-author>
+ </location>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="4195168235">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack Collins</md-author>
+ </location>
+ <count>2</count>
+ <relevance>33068</relevance>
+ <recid>content: title how to program a computer author jack collins</recid>
+</hit>
+<hit>
+ <md-title>The Computer Bible</md-title>
+ <md-date>1973-1980</md-date>
+ <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="3844822301">
+  <md-title>The Computer Bible</md-title>
+  <md-date>1973-1980</md-date>
+  <md-description>Hebrew and Greek; introductions in English</md-description>
+  <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
+ </location>
+ <count>1</count>
+ <relevance>27556</relevance>
+ <recid>content: title the computer bible</recid>
+</hit>
+<hit>
+ <md-title>Computer science &amp; technology</md-title>
+ <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
+ <md-date>1977</md-date>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="3319303400">
+  <md-title>Computer science &amp; technology</md-title>
+  <md-title-remainder>proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976</md-title-remainder>
+  <md-date>1977</md-date>
+ </location>
+ <count>1</count>
+ <relevance>20667</relevance>
+ <recid>content: title computer science technology</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C100</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="4208086653">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C100</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c100</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C24</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="341362961">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C24</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c24</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C25</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="166189994">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C25</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c25</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C26</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="4285984323">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C26</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c26</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C27</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="4110811356">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C27</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c27</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C28</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="3935638389">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C28</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c28</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C29</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="3760465422">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C29</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c29</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C30</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="3585292455">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C30</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c30</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C31</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="3410119488">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C31</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c31</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C32</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="3234946521">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C32</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c32</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C33</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="3059773554">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C33</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c33</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C34</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="2884600587">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C34</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c34</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C35</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="2709427620">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C35</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c35</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C36</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="2534254653">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C36</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c36</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C37</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="2359081686">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C37</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c37</recid>
+</hit>
+<hit>
+ <md-title>How to program a computer</md-title>
+ <md-author>Jack C38</md-author>
+ <location id="localhost:9999/db1"
+    name="db1" checksum="2183908719">
+  <md-title>How to program a computer</md-title>
+  <md-author>Jack C38</md-author>
+ </location>
+ <count>1</count>
+ <relevance>16534</relevance>
+ <recid>content: title how to program a computer author jack c38</recid>
+</hit>
+</show>
\ No newline at end of file
diff --git a/test/test_perf_5.res b/test/test_perf_5.res
new file mode 100644 (file)
index 0000000..bad0324
--- /dev/null
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<termlist><activeclients>0</activeclients>
+<list name="author">
+<term><name>Jack Collins</name><frequency>2</frequency></term>
+<term><name>Adam, James</name><frequency>1</frequency></term>
+<term><name>Carter, Bill</name><frequency>1</frequency></term>
+<term><name>Englund, Carl R</name><frequency>1</frequency></term>
+<term><name>Jack C100</name><frequency>1</frequency></term>
+<term><name>Jack C24</name><frequency>1</frequency></term>
+<term><name>Jack C25</name><frequency>1</frequency></term>
+<term><name>Jack C26</name><frequency>1</frequency></term>
+<term><name>Jack C27</name><frequency>1</frequency></term>
+<term><name>Jack C28</name><frequency>1</frequency></term>
+<term><name>Jack C29</name><frequency>1</frequency></term>
+<term><name>Jack C30</name><frequency>1</frequency></term>
+<term><name>Jack C31</name><frequency>1</frequency></term>
+<term><name>Jack C32</name><frequency>1</frequency></term>
+<term><name>Jack C33</name><frequency>1</frequency></term>
+</list>
+<list name="date">
+<term><name>1977</name><frequency>3</frequency></term>
+<term><name>1971</name><frequency>2</frequency></term>
+<term><name>1974</name><frequency>2</frequency></term>
+<term><name>1980</name><frequency>2</frequency></term>
+<term><name>1987</name><frequency>2</frequency></term>
+<term><name>1991</name><frequency>2</frequency></term>
+<term><name>1993</name><frequency>2</frequency></term>
+<term><name>1968</name><frequency>1</frequency></term>
+<term><name>1972</name><frequency>1</frequency></term>
+<term><name>1973</name><frequency>1</frequency></term>
+<term><name>1984</name><frequency>1</frequency></term>
+<term><name>1986</name><frequency>1</frequency></term>
+<term><name>1992</name><frequency>1</frequency></term>
+</list>
+<list name="subject">
+<term><name>Bible</name><frequency>5</frequency></term>
+<term><name>Internet (Computer network)</name><frequency>2</frequency></term>
+<term><name>United States</name><frequency>2</frequency></term>
+<term><name>Bible. O.T</name><frequency>1</frequency></term>
+<term><name>Bible. O.T. Deuteronomy</name><frequency>1</frequency></term>
+<term><name>Cartography</name><frequency>1</frequency></term>
+<term><name>Community colleges</name><frequency>1</frequency></term>
+<term><name>Computer Systems</name><frequency>1</frequency></term>
+<term><name>Computer networks</name><frequency>1</frequency></term>
+<term><name>Computers</name><frequency>1</frequency></term>
+<term><name>Demonstration centers in education</name><frequency>1</frequency></term>
+<term><name>Dropouts</name><frequency>1</frequency></term>
+<term><name>Educational innovations</name><frequency>1</frequency></term>
+<term><name>Educational technology</name><frequency>1</frequency></term>
+<term><name>FEDLINK (Network)</name><frequency>1</frequency></term>
+</list>
+<list name="xtargets">
+<term>
+<id>localhost:9999/db1</id>
+<name>db1</name>
+<frequency>100</frequency>
+<state>Client_Idle</state>
+<diagnostic>0</diagnostic>
+</term>
+</list>
+</termlist>
\ No newline at end of file
index 3d14bc4..291591e 100644 (file)
@@ -5,7 +5,7 @@ http://localhost:9763/search.pz2?session=2&command=search&query=computer
 gils_service.xml http://localhost:9763/search.pz2?command=init&clear=1
 z3950_indexdata_com_marc.xml http://localhost:9763/search.pz2?session=3&command=settings
 http://localhost:9763/search.pz2?session=3&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 http://localhost:9763/search.pz2?session=2&command=show
-1 http://localhost:9763/search.pz2?session=3&command=show
+w http://localhost:9763/search.pz2?session=3&command=show
 http://localhost:9763/search.pz2?session=3&command=bytarget
index 2d3fd52..c44b00d 100644 (file)
@@ -1,16 +1,16 @@
 http://localhost:9763/search.pz2?command=init&clear=1
 cf_mit_opencourseware_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer%22
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+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
 ocs-loc_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer%22
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+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
 ocs-oaister_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=su%3D%22computer%22
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+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
index b08b8a0..f1b0497 100644 (file)
@@ -1,16 +1,16 @@
 http://localhost:9763/search.pz2?session=1&command=init
 test_rank_settings_1.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water&sort=relevance
-2 http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
+w http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
 http://localhost:9763/search.pz2?session=1&command=init
 test_rank_settings_2.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water&sort=relevance
-2 http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
+w http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
 http://localhost:9763/search.pz2?session=1&command=init
 test_rank_settings_3.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water&sort=relevance
-2 http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
+w http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
 http://localhost:9763/search.pz2?session=1&command=init
 test_rank_settings_4.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water&sort=relevance
-2 http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
+w http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
index 5188826..83c0241 100644 (file)
@@ -4,5 +4,5 @@ http://localhost:9763/search.pz2?session=1&command=settings&category%5Bz3950.ind
 http://localhost:9763/search.pz2?session=1&command=search&query=water
 http://localhost:9763/search.pz2?session=2&command=settings&pz:name%5Bz3950.indexdata.com%2Fmarc%5D=1&pz:cclmap:term%5Bz3950.indexdata.com%2Fmarc%5D=u%3D1016&pz:elements%5Bz3950.indexdata.com%2Fmarc%5D=F
 http://localhost:9763/search.pz2?session=2&command=search&query=water
-3 http://localhost:9763/search.pz2?session=1&command=bytarget&settings=1
-1 http://localhost:9763/search.pz2?session=2&command=bytarget&settings=1
+w http://localhost:9763/search.pz2?session=1&command=bytarget&settings=1
+w http://localhost:9763/search.pz2?session=2&command=bytarget&settings=1
index 80afe72..264cdc0 100644 (file)
@@ -1,32 +1,32 @@
 http://localhost:9763/search.pz2?command=init&clear=1
 test_solr_settings_1.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-4 http://localhost:9763/search.pz2?session=1&command=show&block=preferred
+w http://localhost:9763/search.pz2?session=1&command=show&block=preferred
 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
 test_solr_settings_2.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-3 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
 test_solr_settings_3.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-5 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 http://localhost:9763/search.pz2?session=1&command=bytarget
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Csubject%2Cauthor%2Cdate%2Cmedium
 test_solr_settings_4.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water&maxrecs=200
-3 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 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?session=1&command=search&query=water&limit=subject%3DN.Y
-3 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 test_solr_settings_5.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-5 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 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?session=1&command=search&query=water&limit=subject%3DN.Y
-3 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 test_solr_settings_6.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=date%3D%3F&sort=date:1
 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=date:1
index 0a42801..f358d6e 100644 (file)
@@ -1,6 +1,6 @@
 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
-2 http://localhost:9763/search.pz2?session=1&command=show&block=preferred
+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
index f465378..bccdc0d 100644 (file)
@@ -1,7 +1,7 @@
 http://localhost:9763/search.pz2?session=1&command=init
 test_sort_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-3 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
 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?session=1&command=search&query=water&sort=position:1
@@ -11,4 +11,4 @@ http://localhost:9763/search.pz2?session=1&command=show&start=40&block=prefered&
 http://localhost:9763/search.pz2?session=2&command=init
 test_sort_settings.xml http://localhost:9763/search.pz2?session=2&command=settings
 http://localhost:9763/search.pz2?session=2&command=search&query=water
-http://localhost:9763/search.pz2?session=1&command=show&start=60&block=prefered&sort=date
\ No newline at end of file
+http://localhost:9763/search.pz2?session=1&command=show&start=60&block=prefered&sort=date
index 7148540..294fe36 100644 (file)
 </term>
 </list>
 <list name="subject">
-<term><name>Water-supply</name><frequency>370</frequency></term>
-<term><name>Water</name><frequency>338</frequency></term>
-<term><name>Groundwater</name><frequency>188</frequency></term>
-<term><name>Water resources development</name><frequency>186</frequency></term>
-<term><name>Water quality</name><frequency>174</frequency></term>
-<term><name>Mineral waters</name><frequency>104</frequency></term>
-<term><name>Water quality management</name><frequency>100</frequency></term>
-<term><name>United States</name><frequency>86</frequency></term>
-<term><name>Irrigation</name><frequency>66</frequency></term>
-<term><name>N.Y</name><frequency>56</frequency></term>
-<term><name>Hydraulic engineering</name><frequency>48</frequency></term>
-<term><name>Geology</name><frequency>46</frequency></term>
-<term><name>U.S</name><frequency>46</frequency></term>
-<term><name>Groundwater flow</name><frequency>44</frequency></term>
-<term><name>Birds</name><frequency>42</frequency></term>
+<term><name>Water-supply</name><frequency>185</frequency></term>
+<term><name>Water</name><frequency>169</frequency></term>
+<term><name>Groundwater</name><frequency>94</frequency></term>
+<term><name>Water resources development</name><frequency>93</frequency></term>
+<term><name>Water quality</name><frequency>87</frequency></term>
+<term><name>Mineral waters</name><frequency>52</frequency></term>
+<term><name>Water quality management</name><frequency>50</frequency></term>
+<term><name>United States</name><frequency>43</frequency></term>
+<term><name>Irrigation</name><frequency>33</frequency></term>
+<term><name>N.Y</name><frequency>28</frequency></term>
+<term><name>Hydraulic engineering</name><frequency>24</frequency></term>
+<term><name>Geology</name><frequency>23</frequency></term>
+<term><name>U.S</name><frequency>23</frequency></term>
+<term><name>Groundwater flow</name><frequency>22</frequency></term>
+<term><name>Birds</name><frequency>21</frequency></term>
 </list>
 <list name="author">
-<term><name>Waters, Clara Erskine Clement</name><frequency>18</frequency></term>
-<term><name>Waters, Henry F</name><frequency>16</frequency></term>
-<term><name>Moorman, J. J</name><frequency>14</frequency></term>
-<term><name>Waters, Thomas Franklin</name><frequency>12</frequency></term>
-<term><name>Basak, P</name><frequency>10</frequency></term>
-<term><name>Bergren, Lisa Tawn</name><frequency>10</frequency></term>
-<term><name>Kingsley, Charles</name><frequency>10</frequency></term>
-<term><name>Tyndall, John</name><frequency>10</frequency></term>
-<term><name>Baldwin, William J</name><frequency>8</frequency></term>
-<term><name>Holme, Charles</name><frequency>8</frequency></term>
-<term><name>James, E. J</name><frequency>8</frequency></term>
-<term><name>Nuttall, Thomas</name><frequency>8</frequency></term>
-<term><name>Walton, George Edward</name><frequency>8</frequency></term>
-<term><name>Wilkins, John H</name><frequency>8</frequency></term>
-<term><name>Arthur, Kay</name><frequency>6</frequency></term>
+<term><name>Waters, Clara Erskine Clement</name><frequency>9</frequency></term>
+<term><name>Waters, Henry F</name><frequency>8</frequency></term>
+<term><name>Moorman, J. J</name><frequency>7</frequency></term>
+<term><name>Waters, Thomas Franklin</name><frequency>6</frequency></term>
+<term><name>Basak, P</name><frequency>5</frequency></term>
+<term><name>Bergren, Lisa Tawn</name><frequency>5</frequency></term>
+<term><name>Kingsley, Charles</name><frequency>5</frequency></term>
+<term><name>Tyndall, John</name><frequency>5</frequency></term>
+<term><name>Baldwin, William J</name><frequency>4</frequency></term>
+<term><name>Holme, Charles</name><frequency>4</frequency></term>
+<term><name>James, E. J</name><frequency>4</frequency></term>
+<term><name>Nuttall, Thomas</name><frequency>4</frequency></term>
+<term><name>Walton, George Edward</name><frequency>4</frequency></term>
+<term><name>Wilkins, John H</name><frequency>4</frequency></term>
+<term><name>Arthur, Kay</name><frequency>3</frequency></term>
 </list>
 <list name="date">
-<term><name>2000</name><frequency>822</frequency></term>
-<term><name>1999</name><frequency>636</frequency></term>
-<term><name>1998</name><frequency>180</frequency></term>
-<term><name>2001</name><frequency>174</frequency></term>
-<term><name>1907</name><frequency>100</frequency></term>
-<term><name>1902</name><frequency>92</frequency></term>
-<term><name>1906</name><frequency>86</frequency></term>
-<term><name>1905</name><frequency>78</frequency></term>
-<term><name>1909</name><frequency>78</frequency></term>
-<term><name>1904</name><frequency>72</frequency></term>
-<term><name>1997</name><frequency>70</frequency></term>
-<term><name>1908</name><frequency>66</frequency></term>
-<term><name>1996</name><frequency>64</frequency></term>
-<term><name>1903</name><frequency>60</frequency></term>
-<term><name>1901</name><frequency>58</frequency></term>
+<term><name>2000</name><frequency>411</frequency></term>
+<term><name>1999</name><frequency>318</frequency></term>
+<term><name>1998</name><frequency>90</frequency></term>
+<term><name>2001</name><frequency>87</frequency></term>
+<term><name>1907</name><frequency>50</frequency></term>
+<term><name>1902</name><frequency>46</frequency></term>
+<term><name>1906</name><frequency>43</frequency></term>
+<term><name>1905</name><frequency>39</frequency></term>
+<term><name>1909</name><frequency>39</frequency></term>
+<term><name>1904</name><frequency>36</frequency></term>
+<term><name>1997</name><frequency>35</frequency></term>
+<term><name>1908</name><frequency>33</frequency></term>
+<term><name>1996</name><frequency>32</frequency></term>
+<term><name>1903</name><frequency>30</frequency></term>
+<term><name>1901</name><frequency>29</frequency></term>
 </list>
 <list name="medium">
-<term><name>book</name><frequency>3968</frequency></term>
-<term><name>web</name><frequency>16</frequency></term>
-<term><name>book (electronic)</name><frequency>6</frequency></term>
+<term><name>book</name><frequency>1984</frequency></term>
+<term><name>web</name><frequency>8</frequency></term>
+<term><name>book (electronic)</name><frequency>3</frequency></term>
 </list>
 </termlist>
\ No newline at end of file
index f22d1dd..a970cff 100644 (file)
   <set name="pz:queryencoding"  value="UTF-8" />
   <set name="pz:extra_args"  value="fl=*,score" />
   <set name="pz:termlist_term_count" value="10"/>
-  <set name="pz:facetmap:author"  value="author_exact"  />
-  <set name="pz:facetmap:subject" value="subject_exact" />
-  <set name="pz:facetmap:medium"  value="medium_exact"  />
-  <set name="pz:facetmap:date"  value="date" />
   <set name="pz:maxrecs" value="200" />
   <set name="pz:present_chunk" value="0"/>
 </settings>
index 6f8276e..3adc833 100644 (file)
@@ -1,17 +1,17 @@
 http://localhost:9763/search.pz2?command=init&service=sru-proxy
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cmedium%2Cjournal-title
 http://localhost:9763/search.pz2?session=1&command=search&query=water%20and%20su%3D%22Research%22
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=settings&pz:sru%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=get&pz%3Aname%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=sru-proxy&pz%3Axslt%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=dads-pz2.xsl&pz%3Aqueryencoding%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=UTF-8&pz%3Aapdulog%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1&pz%3Asru_version%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=1.1&pz:query_syntax%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=pqf&pz%3Aextra_args%5Bkb.dadsthirdnode.cvt.dk%2Fsru-proxy%5D=%26x-facet_def%3Ddtic_test%26x-noxsl%3D1
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%%2Cmedium%2Cjournal-title
 http://localhost:9763/search.pz2?session=1&command=search&query=water%20and%20jt%3D%22Forbes%22
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=search&query=water%20and%20au%3D%22Janmaat,%20Johannus%22
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=termlist&name=xtargets%2Cauthor%2Csubject%2Cmedium%2Cjournal-title
 http://localhost:9763/search.pz2?session=1&command=search&query=water%20and%20su%3D%22Research%22
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
index c6d5324..dba2c69 100644 (file)
@@ -1,3 +1,3 @@
 sru_service.xml http://localhost:9763/search.pz2?command=init&service=sru
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-1 http://localhost:9763/search.pz2?session=1&command=show
+w http://localhost:9763/search.pz2?session=1&command=show
index e324fb0..ed0910f 100644 (file)
@@ -1,12 +1,12 @@
 http://localhost:9763/search.pz2?command=init&clear=1
 ztest_localhost_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+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&block=1&name=xtargets%2Cauthor%2Csubject%2Cdate
 test_termlist_block_settings_2.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-4 http://localhost:9763/search.pz2?session=1&command=show&block=1
+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&block=1&name=xtargets%2Cauthor%2Csubject%2Cdate
 http://localhost:9763/search.pz2?session=1&command=termlist&block=1&report=status&name=xtargets%2Cauthor%2Csubject%2Cdate
index 7d2b76c..86548ed 100644 (file)
@@ -1,8 +1,8 @@
 http://localhost:9763/search.pz2?command=init&clear=1
 http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=xml&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=marc21_test.xsl
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 http://localhost:9763/search.pz2?session=1&command=settings&pz:name%5Bz3950.indexdata.com%2Fgils%5D=gils&pz:requestsyntax%5Bz3950.indexdata.com%2Fgils%5D=usmarc&pz:nativesyntax%5Bz3950.indexdata.com%2Fgils%5D=txml&pz:xslt%5Bz3950.indexdata.com%2Fgils%5D=tmarc.xsl
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1
-2 http://localhost:9763/search.pz2?session=1&command=bytarget
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=bytarget
index 6694fe6..505121c 100644 (file)
@@ -1,23 +1,23 @@
 http://localhost:9763/search.pz2?command=init&clear=1&pz:elements%5Bmy%5D=F&pz:requestsyntax%5Bmy%5D=usmarc&pz:nativesyntax%5Bmy%5D=iso2709&pz:xslt%5Bmy%5D=marc21_test.xsl&pz:name%5Bmy%5D=marcserver&pz:url%5Bmy%5D=z3950.indexdata.com%2Fmarc
 http://localhost:9763/search.pz2?session=1&command=search&query=computer
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
 test_url_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=the&maxrecs=3
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:1
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:1
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:0
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:0
+w http://localhost:9763/search.pz2?session=1&command=show&block=1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:1
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:0
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:0
 http://localhost:9763/search.pz2?command=init&clear=1&pz:elements%5Bmy%5D=F&pz:requestsyntax%5Bmy%5D=usmarc&pz:nativesyntax%5Bmy%5D=iso2709&pz:xslt%5Bmy%5D=marc21_test.xsl&pz:name%5Bmy%5D=marcserver&pz:url%5Bmy%5D=z3950.unknown.indexdata.com%2Fmarc
 http://localhost:9763/search.pz2?session=2&command=search&query=fail
 http://localhost:9763/search.pz2?command=init&clear=1&pz:elements%5Bmy%5D=F&pz:requestsyntax%5Bmy%5D=usmarc&pz:nativesyntax%5Bmy%5D=iso2709&pz:xslt%5Bmy%5D=marc21_test.xsl&pz:name%5Bmy%5D=marcserver&pz:url%5Bmy%5D=z3950.indexdata.com%2Fmarc&pz:pqf_strftime%5Bmy%5D=fail+%25%25
 http://localhost:9763/search.pz2?session=3&command=search&query=fail
 test_url_settings.xml http://localhost:9763/search.pz2?session=1&command=settings
 http://localhost:9763/search.pz2?session=1&command=search&query=water
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:1p
-2 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=date:0p
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:1p
+w http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=date:0p
 http://localhost:9763/search.pz2?session=1&command=service
 http://localhost:9763/search.pz2?session=1&command=show&sort=relevance
 http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+title+coal+sample+bank+author+medium+book
 http://localhost:9763/search.pz2?session=1&command=show&block=1&sort=title:1
-http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+title+coal+sample+bank+author+medium+book
\ No newline at end of file
+http://localhost:9763/search.pz2?session=1&command=record&id=content%3A+title+coal+sample+bank+author+medium+book
index 6460a66..bd847df 100644 (file)
@@ -5,7 +5,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.7.0
+PACKAGE_VERSION=1.7.2
 
 # YAZ
 YAZ_DIR=..\..\yaz