Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

author Mike Taylor <mike@indexdata.com>

Mon, 11 Aug 2014 16:53:11 +0000 (17:53 +0100)

committer Mike Taylor <mike@indexdata.com>

Mon, 11 Aug 2014 16:53:11 +0000 (17:53 +0100)
author Mike Taylor <mike@indexdata.com>
Mon, 11 Aug 2014 16:53:11 +0000 (17:53 +0100)
committer Mike Taylor <mike@indexdata.com>
Mon, 11 Aug 2014 16:53:11 +0000 (17:53 +0100)
diff --git a/IDMETA b/IDMETA

index c6330e9..08bd2fd 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 saucy raring quantal precise"
  CENTOS_DIST="centos5 centos6"
  VERSION=1.7.0
diff --git a/debian/changelog b/debian/changelog

deleted file mode 100644 (file)

index 9db1ea6..0000000
--- a/debian/changelog
+++ /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
diff --git a/src/session.c b/src/session.c

index 6d7ab65..eac40a0 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -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)
diff --git a/src/settings.c b/src/settings.c

index a17d094..ece8f04 100644 (file)
--- a/src/settings.c
+++ b/src/settings.c
@@ -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;
  }
  
  
diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh

index 20395aa..1f4a94d 100755 (executable)
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -17,6 +17,7 @@ kill_pazpar2()
      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`
@@ -28,7 +29,6 @@ kill_pazpar2()
      fi
  }
  
-perf=false
  ztest=false
  icu=false
  while test $# -gt 0; do
@@ -43,9 +43,6 @@ while test $# -gt 0; do
          --icu)
              icu=true
              ;;
-       --perf)
-           perf=true
-           ;;
          -*)
             echo "Bad option $1"
             exit 1
@@ -151,20 +148,21 @@ else
      maxrounds=10
  fi
  LEVELS=loglevel,fatal,warn,log,debug,zoom,zoomdetails
-if test -n "$PAZPAR2_USE_VALGRIND"; then
+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
      WAIT=400
  elif test -n "$SKIP_PAZPAR2"; then
      echo "${PREFIX}: not starting Pazpar2 (should be running already)"
-elif $perf; then
-    /usr/bin/time -p ../src/pazpar2 -p pazpar2.pid -X -l ${PREFIX}_pazpar2.log -f ${srcdir}/${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
-    PP2PID=$!
-    sleep 1
-    if test -f pazpar2.pid; then
-       PP2PID=`cat pazpar2.pid`
-    fi
  else
      ../src/pazpar2 -v $LEVELS -d -X -l ${PREFIX}_pazpar2.log -f ${srcdir}/${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
      PP2PID=$!
@@ -242,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
@@ -280,7 +281,7 @@ if [ "$WAIT_PAZPAR2" ] ; then
  fi
  kill_pazpar2
  sleep 2
-if $perf; then
+if test "$PERF_PROG"; then
      tail -3 ${PREFIX}_extra_pazpar2.log
  fi
  exit $code
diff --git a/test/test_cluster.urls b/test/test_cluster.urls

index 6c772d5..3bc2510 100755 (executable)
--- a/test/test_cluster.urls
+++ b/test/test_cluster.urls
@@ -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
diff --git a/test/test_dads.urls b/test/test_dads.urls

index 48e1f57..d8db7aa 100644 (file)
--- a/test/test_dads.urls
+++ b/test/test_dads.urls
@@ -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
diff --git a/test/test_facets.urls b/test/test_facets.urls

index bf2924b..da84d76 100644 (file)
--- a/test/test_facets.urls
+++ b/test/test_facets.urls
@@ -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
diff --git a/test/test_filter.urls b/test/test_filter.urls

index 71014ee..fefe93b 100644 (file)
--- a/test/test_filter.urls
+++ b/test/test_filter.urls
@@ -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
diff --git a/test/test_gbv_de.urls b/test/test_gbv_de.urls

index e0d8137..ad3e375 100644 (file)
--- a/test/test_gbv_de.urls
+++ b/test/test_gbv_de.urls
@@ -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
diff --git a/test/test_http.urls b/test/test_http.urls

index 3b4f7e9..64619da 100644 (file)
--- a/test/test_http.urls
+++ b/test/test_http.urls
@@ -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
  http://localhost:9763/search.pz2?session=9&command=bytarget
  http://localhost:9763/search.pz2?session=9&command=show
diff --git a/test/test_http_45.res b/test/test_http_45.res

index fa73966..2b2fb5b 100644 (file)
--- a/test/test_http_45.res
+++ b/test/test_http_45.res
@@ -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>
@@ -25,15 +25,6 @@
    <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>
diff --git a/test/test_http_49.res b/test/test_http_49.res

index 9832043..4c1f533 100644 (file)
--- a/test/test_http_49.res
+++ b/test/test_http_49.res
@@ -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>
@@ -26,12 +26,6 @@
    <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>
diff --git a/test/test_http_50.res b/test/test_http_50.res

index fa73966..2b2fb5b 100644 (file)
--- a/test/test_http_50.res
+++ b/test/test_http_50.res
@@ -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>
@@ -25,15 +25,6 @@
    <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>
diff --git a/test/test_http_60.res b/test/test_http_60.res

index 99b482c..298cdb2 100644 (file)
--- a/test/test_http_60.res
+++ b/test/test_http_60.res
@@ -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>
@@ -26,12 +26,6 @@
    <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>
diff --git a/test/test_http_63.res b/test/test_http_63.res

index 99b482c..298cdb2 100644 (file)
--- a/test/test_http_63.res
+++ b/test/test_http_63.res
@@ -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>
@@ -26,12 +26,6 @@
    <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>
diff --git a/test/test_http_65.res b/test/test_http_65.res

index b24d50f..efe653d 100644 (file)
--- a/test/test_http_65.res
+++ b/test/test_http_65.res
@@ -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>
diff --git a/test/test_http_66.res b/test/test_http_66.res

index 99b482c..298cdb2 100644 (file)
--- a/test/test_http_66.res
+++ b/test/test_http_66.res
@@ -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>
@@ -26,12 +26,6 @@
    <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>
diff --git a/test/test_http_71.res b/test/test_http_71.res

index b24d50f..efe653d 100644 (file)
--- a/test/test_http_71.res
+++ b/test/test_http_71.res
@@ -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>
diff --git a/test/test_http_72.res b/test/test_http_72.res

index 99b482c..298cdb2 100644 (file)
--- a/test/test_http_72.res
+++ b/test/test_http_72.res
@@ -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>
@@ -26,12 +26,6 @@
    <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>
diff --git a/test/test_http_74.res b/test/test_http_74.res

index a105782..698a09e 100644 (file)
--- a/test/test_http_74.res
+++ b/test/test_http_74.res
@@ -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>
diff --git a/test/test_http_76.res b/test/test_http_76.res

index 4d7509d..ad132e9 100644 (file)
--- a/test/test_http_76.res
+++ b/test/test_http_76.res
@@ -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>
diff --git a/test/test_http_79.res b/test/test_http_79.res

index ced6941..3bbbe07 100644 (file)
--- a/test/test_http_79.res
+++ b/test/test_http_79.res
@@ -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>
@@ -26,12 +26,6 @@
    <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>
diff --git a/test/test_http_81.res b/test/test_http_81.res

index ace9c5e..4633a6c 100644 (file)
--- a/test/test_http_81.res
+++ b/test/test_http_81.res
@@ -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>
@@ -26,12 +26,6 @@
    <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>
diff --git a/test/test_http_82.res b/test/test_http_82.res

index fa5a350..d7bc82b 100644 (file)
--- a/test/test_http_82.res
+++ b/test/test_http_82.res
@@ -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>
diff --git a/test/test_http_84.res b/test/test_http_84.res

index 4f857e5..530d935 100644 (file)
--- a/test/test_http_84.res
+++ b/test/test_http_84.res
@@ -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>
@@ -26,12 +26,6 @@
    <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>
diff --git a/test/test_http_88.res b/test/test_http_88.res

index ced51fb..890a78d 100644 (file)
--- a/test/test_http_88.res
+++ b/test/test_http_88.res
@@ -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>
diff --git a/test/test_http_89.res b/test/test_http_89.res

index 9bb5d30..b91efcb 100644 (file)
--- a/test/test_http_89.res
+++ b/test/test_http_89.res
@@ -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>
@@ -25,12 +25,9 @@
    <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>
@@ -38,12 +35,9 @@
    <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>
@@ -53,12 +47,9 @@
    <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>
@@ -67,12 +58,6 @@
    <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>
diff --git a/test/test_http_90.res b/test/test_http_90.res

index 480b05e..86487ca 100644 (file)
--- a/test/test_http_90.res
+++ b/test/test_http_90.res
@@ -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>
diff --git a/test/test_icu.urls b/test/test_icu.urls

index be4e983..fefa859 100644 (file)
--- a/test/test_icu.urls
+++ b/test/test_icu.urls
@@ -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
diff --git a/test/test_limit_limitmap.urls b/test/test_limit_limitmap.urls

index 13e1155..0d77e59 100644 (file)
--- a/test/test_limit_limitmap.urls
+++ b/test/test_limit_limitmap.urls
@@ -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
  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.sh b/test/test_perf.sh

index bf0e59d..c6fd22c 100755 (executable)
--- a/test/test_perf.sh
+++ b/test/test_perf.sh
@@ -4,7 +4,12 @@ TEST=`basename $0 .sh`
  # srcdir might be set by make
  srcdir=${srcdir:-"."}
  
-exec ${srcdir}/run_pazpar2.sh --ztest --icu --perf $TEST
+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
diff --git a/test/test_perf.urls b/test/test_perf.urls

index 60a342c..7b23363 100644 (file)
--- a/test/test_perf.urls
+++ b/test/test_perf.urls
@@ -1,5 +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
-http://localhost:9763/search.pz2?session=1&command=show&block=1
+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_4.res b/test/test_perf_4.res

index dd96735..dc992a3 100644 (file)
--- a/test/test_perf_4.res
+++ b/test/test_perf_4.res
@@ -1,7 +1,7 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <show><status>OK</status>
-<activeclients>1</activeclients>
-<merged>39</merged>
+<activeclients>0</activeclients>
+<merged>99</merged>
  <total>100</total>
  <start>0</start>
  <num>20</num>
@@ -16,7 +16,7 @@
    <md-description>Title from caption</md-description>
   </location>
   <count>1</count>
- <relevance>152547</relevance>
+ <relevance>55113</relevance>
   <recid>content: title internet world</recid>
  </hit>
  <hit>
@@ -33,7 +33,7 @@
    <md-author>Jack Collins</md-author>
   </location>
   <count>2</count>
- <relevance>91528</relevance>
+ <relevance>33068</relevance>
   <recid>content: title how to program a computer author jack collins</recid>
  </hit>
  <hit>
@@ -48,7 +48,7 @@
    <md-description>Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates</md-description>
   </location>
   <count>1</count>
- <relevance>76273</relevance>
+ <relevance>27556</relevance>
   <recid>content: title the computer bible</recid>
  </hit>
  <hit>
@@ -62,11 +62,23 @@
    <md-date>1977</md-date>
   </location>
   <count>1</count>
- <relevance>57205</relevance>
+ <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">
@@ -74,7 +86,7 @@
    <md-author>Jack C24</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c24</recid>
  </hit>
  <hit>
@@ -86,7 +98,7 @@
    <md-author>Jack C25</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c25</recid>
  </hit>
  <hit>
@@ -98,7 +110,7 @@
    <md-author>Jack C26</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c26</recid>
  </hit>
  <hit>
@@ -110,7 +122,7 @@
    <md-author>Jack C27</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c27</recid>
  </hit>
  <hit>
@@ -122,7 +134,7 @@
    <md-author>Jack C28</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c28</recid>
  </hit>
  <hit>
@@ -134,7 +146,7 @@
    <md-author>Jack C29</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c29</recid>
  </hit>
  <hit>
@@ -146,7 +158,7 @@
    <md-author>Jack C30</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c30</recid>
  </hit>
  <hit>
@@ -158,7 +170,7 @@
    <md-author>Jack C31</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c31</recid>
  </hit>
  <hit>
@@ -170,7 +182,7 @@
    <md-author>Jack C32</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c32</recid>
  </hit>
  <hit>
@@ -182,7 +194,7 @@
    <md-author>Jack C33</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c33</recid>
  </hit>
  <hit>
@@ -194,7 +206,7 @@
    <md-author>Jack C34</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c34</recid>
  </hit>
  <hit>
@@ -206,7 +218,7 @@
    <md-author>Jack C35</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c35</recid>
  </hit>
  <hit>
@@ -218,7 +230,7 @@
    <md-author>Jack C36</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c36</recid>
  </hit>
  <hit>
@@ -230,7 +242,7 @@
    <md-author>Jack C37</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c37</recid>
  </hit>
  <hit>
@@ -242,19 +254,7 @@
    <md-author>Jack C38</md-author>
   </location>
   <count>1</count>
- <relevance>45764</relevance>
+ <relevance>16534</relevance>
   <recid>content: title how to program a computer author jack c38</recid>
  </hit>
-<hit>
- <md-title>How to program a computer</md-title>
- <md-author>Jack C39</md-author>
- <location id="localhost:9999/db1"
-    name="db1" checksum="2008735752">
-  <md-title>How to program a computer</md-title>
-  <md-author>Jack C39</md-author>
- </location>
- <count>1</count>
- <relevance>45764</relevance>
- <recid>content: title how to program a computer author jack c39</recid>
-</hit>
  </show>
\ No newline at end of file
diff --git a/test/test_post.urls b/test/test_post.urls

index 3d14bc4..291591e 100644 (file)
--- a/test/test_post.urls
+++ b/test/test_post.urls
@@ -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
diff --git a/test/test_preferred.urls b/test/test_preferred.urls

index 2d3fd52..c44b00d 100644 (file)
--- a/test/test_preferred.urls
+++ b/test/test_preferred.urls
@@ -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
diff --git a/test/test_rank.urls b/test/test_rank.urls

index b08b8a0..f1b0497 100644 (file)
--- a/test/test_rank.urls
+++ b/test/test_rank.urls
@@ -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
diff --git a/test/test_settings.urls b/test/test_settings.urls

index 5188826..83c0241 100644 (file)
--- a/test/test_settings.urls
+++ b/test/test_settings.urls
@@ -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
diff --git a/test/test_solr.urls b/test/test_solr.urls

index 80afe72..264cdc0 100644 (file)
--- a/test/test_solr.urls
+++ b/test/test_solr.urls
@@ -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
diff --git a/test/test_solr_spell.urls b/test/test_solr_spell.urls

index 0a42801..f358d6e 100644 (file)
--- a/test/test_solr_spell.urls
+++ b/test/test_solr_spell.urls
@@ -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
diff --git a/test/test_sort.urls b/test/test_sort.urls

index f465378..bccdc0d 100644 (file)
--- a/test/test_sort.urls
+++ b/test/test_sort.urls
@@ -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
diff --git a/test/test_sort_6.res b/test/test_sort_6.res

index 7148540..294fe36 100644 (file)
--- a/test/test_sort_6.res
+++ b/test/test_sort_6.res
@@ -10,59 +10,59 @@
  </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
diff --git a/test/test_sort_settings.xml b/test/test_sort_settings.xml

index f22d1dd..a970cff 100644 (file)
--- a/test/test_sort_settings.xml
+++ b/test/test_sort_settings.xml
@@ -35,10 +35,6 @@
    <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>
diff --git a/test/test_sru-proxy.urls b/test/test_sru-proxy.urls

index 6f8276e..3adc833 100644 (file)
--- a/test/test_sru-proxy.urls
+++ b/test/test_sru-proxy.urls
@@ -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
diff --git a/test/test_sru.urls b/test/test_sru.urls

index c6d5324..dba2c69 100644 (file)
--- a/test/test_sru.urls
+++ b/test/test_sru.urls
@@ -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
diff --git a/test/test_termlist_block.urls b/test/test_termlist_block.urls

index e324fb0..ed0910f 100644 (file)
--- a/test/test_termlist_block.urls
+++ b/test/test_termlist_block.urls
@@ -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
diff --git a/test/test_turbomarcxml.urls b/test/test_turbomarcxml.urls

index 7d2b76c..86548ed 100644 (file)
--- a/test/test_turbomarcxml.urls
+++ b/test/test_turbomarcxml.urls
@@ -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
diff --git a/test/test_url.urls b/test/test_url.urls

index 6694fe6..505121c 100644 (file)
--- a/test/test_url.urls
+++ b/test/test_url.urls
@@ -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
author	Mike Taylor <mike@indexdata.com>
	Mon, 11 Aug 2014 16:53:11 +0000 (17:53 +0100)
committer	Mike Taylor <mike@indexdata.com>
	Mon, 11 Aug 2014 16:53:11 +0000 (17:53 +0100)
IDMETA		patch \| blob \| history
debian/changelog	[deleted file]	patch \| blob \| history
src/session.c		patch \| blob \| history
src/settings.c		patch \| blob \| history
test/run_pazpar2.sh		patch \| blob \| history
test/test_cluster.urls		patch \| blob \| history
test/test_dads.urls		patch \| blob \| history
test/test_facets.urls		patch \| blob \| history
test/test_filter.urls		patch \| blob \| history
test/test_gbv_de.urls		patch \| blob \| history
test/test_http.urls		patch \| blob \| history
test/test_http_45.res		patch \| blob \| history
test/test_http_49.res		patch \| blob \| history
test/test_http_50.res		patch \| blob \| history
test/test_http_60.res		patch \| blob \| history
test/test_http_63.res		patch \| blob \| history
test/test_http_65.res		patch \| blob \| history
test/test_http_66.res		patch \| blob \| history
test/test_http_71.res		patch \| blob \| history
test/test_http_72.res		patch \| blob \| history
test/test_http_74.res		patch \| blob \| history
test/test_http_76.res		patch \| blob \| history
test/test_http_79.res		patch \| blob \| history
test/test_http_81.res		patch \| blob \| history
test/test_http_82.res		patch \| blob \| history
test/test_http_84.res		patch \| blob \| history
test/test_http_88.res		patch \| blob \| history
test/test_http_89.res		patch \| blob \| history
test/test_http_90.res		patch \| blob \| history
test/test_icu.urls		patch \| blob \| history
test/test_limit_limitmap.urls		patch \| blob \| history
test/test_perf.sh		patch \| blob \| history
test/test_perf.urls		patch \| blob \| history
test/test_perf_4.res		patch \| blob \| history
test/test_post.urls		patch \| blob \| history
test/test_preferred.urls		patch \| blob \| history
test/test_rank.urls		patch \| blob \| history
test/test_settings.urls		patch \| blob \| history
test/test_solr.urls		patch \| blob \| history
test/test_solr_spell.urls		patch \| blob \| history
test/test_sort.urls		patch \| blob \| history
test/test_sort_6.res		patch \| blob \| history
test/test_sort_settings.xml		patch \| blob \| history
test/test_sru-proxy.urls		patch \| blob \| history
test/test_sru.urls		patch \| blob \| history
test/test_termlist_block.urls		patch \| blob \| history
test/test_turbomarcxml.urls		patch \| blob \| history
test/test_url.urls		patch \| blob \| history