From 0f1fa7a2780b5d03377a4b4e57cba09c83f7b987 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 19 Aug 2014 09:39:33 +0200 Subject: [PATCH] Merge with master --- IDMETA | 4 +- NEWS | 11 + TODO | 15 - configure.ac | 2 +- debian/changelog | 674 ----------------------------------------- doc/Makefile.am | 2 +- doc/pazpar2_protocol.xml | 2 +- etc/default.xml | 22 +- etc/mkc.xml | 20 +- etc/pazpar2.cfg.dist | 4 +- etc/perf_server.cfg | 6 +- etc/pz2.xsd | 6 +- src/eventl.c | 216 +++++++------ src/eventl.h | 3 +- src/session.c | 38 +-- src/settings.c | 25 +- test/Makefile.am | 3 +- test/run_pazpar2.sh | 41 ++- test/test_cluster.urls | 8 +- test/test_dads.urls | 4 +- test/test_facets.urls | 6 +- test/test_filter.urls | 2 +- test/test_gbv_de.urls | 2 +- test/test_http.urls | 36 +-- test/test_http_45.res | 11 +- test/test_http_49.res | 8 +- test/test_http_50.res | 11 +- test/test_http_60.res | 8 +- test/test_http_63.res | 8 +- test/test_http_65.res | 2 +- test/test_http_66.res | 8 +- test/test_http_71.res | 2 +- test/test_http_72.res | 8 +- test/test_http_74.res | 5 +- test/test_http_76.res | 17 +- test/test_http_79.res | 10 +- test/test_http_81.res | 16 +- test/test_http_82.res | 2 +- test/test_http_84.res | 8 +- test/test_http_88.res | 50 +-- test/test_http_89.res | 50 +-- test/test_http_90.res | 50 +-- test/test_icu.urls | 2 +- test/test_limit_limitmap.urls | 22 +- test/test_perf.cfg | 57 ++++ test/test_perf.sh | 18 ++ test/test_perf.urls | 5 + test/test_perf_1.res | 3 + test/test_perf_2.res | 2 + test/test_perf_3.res | 2 + test/test_perf_4.res | 260 ++++++++++++++++ test/test_perf_5.res | 61 ++++ test/test_post.urls | 4 +- test/test_preferred.urls | 6 +- test/test_rank.urls | 8 +- test/test_settings.urls | 4 +- test/test_solr.urls | 14 +- test/test_solr_spell.urls | 2 +- test/test_sort.urls | 4 +- test/test_sort_6.res | 96 +++--- test/test_sort_settings.xml | 4 - test/test_sru-proxy.urls | 12 +- test/test_sru.urls | 2 +- test/test_termlist_block.urls | 4 +- test/test_turbomarcxml.urls | 6 +- test/test_url.urls | 18 +- win/makefile | 2 +- 67 files changed, 819 insertions(+), 1225 deletions(-) delete mode 100644 TODO delete mode 100644 debian/changelog create mode 100644 test/test_perf.cfg create mode 100755 test/test_perf.sh create mode 100644 test/test_perf.urls create mode 100644 test/test_perf_1.res create mode 100644 test/test_perf_2.res create mode 100644 test/test_perf_3.res create mode 100644 test/test_perf_4.res create mode 100644 test/test_perf_5.res diff --git a/IDMETA b/IDMETA index c6330e9..420050a 100644 --- a/IDMETA +++ b/IDMETA @@ -1,4 +1,4 @@ DEBIAN_DIST="jessie wheezy squeeze" -UBUNTU_DIST="trusty saucy raring quantal precise oneiric" +UBUNTU_DIST="trusty precise" CENTOS_DIST="centos5 centos6" -VERSION=1.7.0 +VERSION=1.7.2 diff --git a/NEWS b/NEWS index 6d9f270..610cba1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +--- 1.7.2 2014/08/18 + +Fix hang for 2nd use of target with unresolved DNS PAZ-949 + +--- 1.7.1 2014/08/14 + +Use poll rather than select for main event loop to overcome limit of +1024 file descriptors PAZ-947 + +Override setting with same name (do not append) PAZ-945 + --- 1.7.0 2014/06/27 Separate package: pazpar2-xsl PAZ-932 diff --git a/TODO b/TODO deleted file mode 100644 index 6908b30..0000000 --- a/TODO +++ /dev/null @@ -1,15 +0,0 @@ -Short term: - -(moved to Bugzilla) - -Longer term: - -Server-specific CCL-mapping (simple, follows from structured target profiles) -Networked mechanism to control configuration -Target selection by metadata -- 'subject', 'location', 'library - type' -- should be totally generic to support requirements of - different projects. -Factor Z39.50 stuff out from pazpar2.c to separate file to make room for - later SRU implementation (essential if we do THDI or LOT. Not hard to do) - -Nice to have: diff --git a/configure.ac b/configure.ac index 6fa9844..95defaf 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,7 @@ esac YAZ_DOC AC_SEARCH_LIBS([log],[m]) -AC_CHECK_HEADERS([sys/time.h sys/socket.h unistd.h netinet/in.h netdb.h arpa/inet.h]) +AC_CHECK_HEADERS([sys/time.h sys/socket.h unistd.h netdb.h]) checkBoth=0 AC_CHECK_FUNC([connect]) if test "$ac_cv_func_connect" = "no"; then diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 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 Fri, 27 Jun 2014 15:48:37 +0200 - -pazpar2 (1.7.0-1.indexdata) unstable; urgency=medium - - * Upstream. - - -- Adam Dickmeiss Fri, 27 Jun 2014 15:02:50 +0200 - -pazpar2 (1.6.41-1.indexdata) unstable; urgency=medium - - * Upstream. - - -- Adam Dickmeiss Wed, 23 Apr 2014 13:51:40 +0200 - -pazpar2 (1.6.40-1.indexdata) unstable; urgency=medium - - * Upstream. - - -- Adam Dickmeiss Thu, 10 Apr 2014 15:28:09 +0200 - -pazpar2 (1.6.39-1.indexdata) unstable; urgency=medium - - * Upstream. - - -- Adam Dickmeiss Wed, 19 Feb 2014 13:31:49 +0100 - -pazpar2 (1.6.38-1.indexdata) unstable; urgency=medium - - * Upstream. - - -- Adam Dickmeiss Tue, 07 Jan 2014 13:56:01 +0100 - -pazpar2 (1.6.37-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Mon, 18 Nov 2013 10:39:51 +0100 - -pazpar2 (1.6.36-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Mon, 11 Nov 2013 13:59:08 +0100 - -pazpar2 (1.6.35-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Mon, 23 Sep 2013 11:28:23 +0200 - -pazpar2 (1.6.34-2indexdata) unstable; urgency=low - - * Testing fix for #-suffix - - -- Adam Dickmeiss Mon, 02 Sep 2013 13:38:48 +0200 - -pazpar2 (1.6.34-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 30 Aug 2013 13:45:14 +0200 - -pazpar2 (1.6.33-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Tue, 13 Aug 2013 14:15:05 +0200 - -pazpar2 (1.6.32-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 14 Jun 2013 10:50:14 +0200 - -pazpar2 (1.6.31-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 24 May 2013 08:49:27 +0200 - -pazpar2 (1.6.30-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 26 Apr 2013 11:16:59 +0200 - -pazpar2 (1.6.29-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 05 Apr 2013 14:50:22 +0200 - -pazpar2 (1.6.28-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Thu, 21 Mar 2013 10:57:39 +0100 - -pazpar2 (1.6.27-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 08 Mar 2013 13:31:35 +0100 - -pazpar2 (1.6.26-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 08 Mar 2013 12:23:36 +0100 - -pazpar2 (1.6.25-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Thu, 07 Feb 2013 12:55:25 +0100 - -pazpar2 (1.6.24-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 18 Jan 2013 14:29:01 +0100 - -pazpar2 (1.6.23-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Wed, 02 Jan 2013 12:35:14 +0100 - -pazpar2 (1.6.22-4indexdata) unstable; urgency=low - - * Patch for blocked show problem. - - -- Adam Dickmeiss Mon, 24 Dec 2012 11:36:31 +0100 - -pazpar2 (1.6.22-3indexdata) unstable; urgency=low - - * Testing filter on merged metadata. - - -- Adam Dickmeiss Fri, 14 Dec 2012 17:23:39 +0100 - -pazpar2 (1.6.22-2indexdata) unstable; urgency=low - - * Testing diagnostics for timeout - - -- Adam Dickmeiss Tue, 11 Dec 2012 12:56:15 +0100 - -pazpar2 (1.6.22-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Thu, 11 Oct 2012 09:50:32 +0200 - -pazpar2 (1.6.21-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Mon, 24 Sep 2012 19:47:58 +0200 - -pazpar2 (1.6.20-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 21 Sep 2012 15:11:59 +0200 - -pazpar2 (1.6.19-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Tue, 18 Sep 2012 14:58:16 +0200 - -pazpar2 (1.6.18-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Mon, 17 Sep 2012 13:05:14 +0200 - -pazpar2 (1.6.17-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Wed, 05 Sep 2012 11:17:31 +0200 - -pazpar2 (1.6.16-1indexdata) unstable; urgency=low - - * Upstream - - -- Dennis Schafroth Thu, 23 Aug 2012 16:00:33 +0200 - -pazpar2 (1.6.15-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Wed, 27 Jun 2012 11:26:16 +0200 - -pazpar2 (1.6.14-1indexdata) unstable; urgency=low - - * Upstream - - -- Dennis Schafroth Mon, 04 Jun 2012 12:10:08 +0200 - -pazpar2 (1.6.13-1indexdata) unstable; urgency=low - - * Upstream - - -- Dennis Schafroth Wed, 23 May 2012 12:24:57 +0000 - -pazpar2 (1.6.12-1indexdata) unstable; urgency=low - - * Upstream - - -- Dennis Schafroth Wed, 14 Mar 2012 11:22:57 +0000 - -pazpar2 (1.6.11-1indexdata) unstable; urgency=low - - * Upstream - - -- Dennis Schafroth Wed, 07 Mar 2012 11:24:13 +0000 - -pazpar2 (1.6.10-1indexdata) unstable; urgency=low - - * Upstream - - -- Dennis Schafroth Thu, 23 Feb 2012 10:32:07 +0000 - -pazpar2 (1.6.9-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Thu, 19 Jan 2012 15:31:44 +0100 - -pazpar2 (1.6.8-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Tue, 17 Jan 2012 12:40:01 +0100 - -pazpar2 (1.6.7-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 23 Dec 2011 13:33:17 +0100 - -pazpar2 (1.6.6-3indexdata) unstable; urgency=low - - * Local filtering - - -- Adam Dickmeiss Fri, 16 Dec 2011 13:44:43 +0100 - -pazpar2 (1.6.6-2indexdata) unstable; urgency=low - - * Testing - - -- Adam Dickmeiss Tue, 13 Dec 2011 14:39:42 +0100 - -pazpar2 (1.6.6-1indexdata) unstable; urgency=low - - * Upstream - - -- Dennis Schafroth Fri, 25 Nov 2011 13:53:24 +0000 - -pazpar2 (1.6.5-1indexdata) unstable; urgency=low - - * Upstream - - -- Dennis Schafroth Tue, 01 Nov 2011 13:35:19 +0000 - -pazpar2 (1.6.4-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 28 Oct 2011 12:19:50 +0200 - -pazpar2 (1.6.3-2indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Thu, 27 Oct 2011 14:12:04 +0200 - -pazpar2 (1.6.3-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Thu, 22 Sep 2011 12:49:36 +0200 - -pazpar2 (1.6.2-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Thu, 15 Sep 2011 11:21:11 +0200 - -pazpar2 (1.6.1-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Wed, 14 Sep 2011 14:21:35 +0200 - -pazpar2 (1.6.0-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Mon, 12 Sep 2011 14:39:43 +0200 - -pazpar2 (1.5.7-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 19 Aug 2011 13:29:58 +0200 - -pazpar2 (1.5.6-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 15 Apr 2011 11:42:25 +0000 - -pazpar2 (1.5.5-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Mon, 28 Mar 2011 15:42:06 +0200 - -pazpar2 (1.5.3-1indexdata) unstable; urgency=low - - * Upstream. - - -- Dennis Schafroth Fri, 18 Feb 2011 12:26:12 +0100 - -pazpar2 (1.5.2-1indexdata) unstable; urgency=low - - * Upstream - - -- Dennis Schafroth Tue, 18 Jan 2011 10:51:26 +0100 - -pazpar2 (1.5.1-1indexdata) unstable; urgency=low - - * Upstream. - - -- Dennis Schafroth Thu, 06 Jan 2011 17:30:59 +0200 - -pazpar2 (1.5.0-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Tue, 05 Oct 2010 12:43:59 +0200 - -pazpar2 (1.4.4-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Tue, 17 Aug 2010 13:22:40 +0200 - -pazpar2 (1.4.3-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Thu, 01 Jul 2010 14:04:10 +0200 - -pazpar2 (1.4.2-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 18 Jun 2010 11:32:46 +0200 - -pazpar2 (1.4.1-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 21 May 2010 14:56:46 +0200 - -pazpar2 (1.4.0-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Thu, 29 Apr 2010 13:07:13 +0200 - -pazpar2 (1.3.0-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Mon, 25 Jan 2010 10:39:26 +0100 - -pazpar2 (1.2.4-2indexdata) karmic; urgency=low - - * services-available/enabled structure. - - -- Adam Dickmeiss Fri, 15 Jan 2010 13:29:58 +0100 - -pazpar2 (1.2.4-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 15 Jan 2010 10:08:36 +0100 - -pazpar2 (1.2.3-3indexdata) unstable; urgency=low - - * Upstream: another interrim package. - - -- Mike Taylor 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 Wed, 13 Jan 2010 14:15:46 +0000 - -pazpar2 (1.2.3-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Tue, 24 Nov 2009 12:22:52 +0100 - -pazpar2 (1.2.2-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Tue, 13 Oct 2009 11:23:52 +0200 - -pazpar2 (1.2.1-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Mon, 05 Oct 2009 09:48:43 +0200 - -pazpar2 (1.2.0-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Thu, 10 Sep 2009 09:48:25 +0200 - -pazpar2 (1.1.1-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 28 Aug 2009 14:37:35 +0200 - -pazpar2 (1.1.0-1indexdata) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Wed, 19 Aug 2009 13:29:29 +0200 - -pazpar2 (1.0.9-1) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 23 May 2008 12:08:51 +0200 - -pazpar2 (1.0.8-1) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Tue, 22 Apr 2008 21:30:47 +0200 - -pazpar2 (1.0.7-2) unstable; urgency=low - - * Update NEWS. - - -- Adam Dickmeiss 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 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 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 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 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 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 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 Tue, 2 Oct 2007 14:35:42 +0200 - -pazpar2 (1.0.4-2) unstable; urgency=low - - * Lower connect timeout. - - -- Adam Dickmeiss Tue, 02 Oct 2007 10:39:37 +0200 - -pazpar2 (1.0.4-1) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Fri, 28 Sep 2007 14:19:25 +0200 - -pazpar2 (1.0.3-6) unstable; urgency=low - - * HTTP fixes. Bugs #1639, #1665. - - -- Adam Dickmeiss 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 Thu, 20 Sep 2007 10:36:11 +0200 - -pazpar2 (1.0.3-4) unstable; urgency=low - - * Fixed bug #1628. - - -- Adam Dickmeiss Thu, 20 Sep 2007 10:14:03 +0200 - -pazpar2 (1.0.3-3) unstable; urgency=low - - * Deal with bad hit counts. - - -- Adam Dickmeiss 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 Wed, 19 Sep 2007 14:55:45 +0200 - -pazpar2 (1.0.3-1) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss 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 Mon, 10 Sep 2007 10:44:03 +0200 - -pazpar2 (1.0.2-8) unstable; urgency=low - - * Bug fixes #1395, #1507. - - -- Adam Dickmeiss 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 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 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 Wed, 22 Aug 2007 15:24:54 +0200 - -pazpar2 (1.0.2-4) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Wed, 22 Aug 2007 11:54:48 +0200 - -pazpar2 (1.0.2-3) unstable; urgency=low - - * Includes fix of bug #1348. - - -- Adam Dickmeiss Mon, 13 Aug 2007 14:12:50 +0200 - -pazpar2 (1.0.2-2) unstable; urgency=low - - * Sorting by year. - - -- Adam Dickmeiss Mon, 23 Jul 2007 14:28:13 +0200 - -pazpar2 (1.0.2-1) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Tue, 10 Jul 2007 11:10:47 +0200 - -pazpar2 (1.0.1-1) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Tue, 03 Jul 2007 21:49:23 +0200 - -pazpar2 (1.0.0-4) unstable; urgency=low - - * Added logrotate file. - - -- Adam Dickmeiss 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 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 Wed, 20 Jun 2007 15:37:26 +0200 - -pazpar2 (1.0.0-1) unstable; urgency=low - - * Upstream. - - -- Adam Dickmeiss Wed, 20 Jun 2007 10:38:04 +0200 - -pazpar2 (0.1-5) unstable; urgency=low - - * File ap2pazpar2.cfg part of pazpar2-apache2. - - -- Adam Dickmeiss 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 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 Mon, 18 Jun 2007 15:43:36 +0200 - -pazpar2 (0.1-2) unstable; urgency=low - - * First version with start/stop script. - - -- Adam Dickmeiss Mon, 18 Jun 2007 13:39:32 +0200 - -pazpar2 (0.1-1) unstable; urgency=low - - * Initial Release. - - -- Adam Dickmeiss Sun, 17 Jun 2007 08:44:17 +0200 diff --git a/doc/Makefile.am b/doc/Makefile.am index f713e72..8061df2 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -48,7 +48,7 @@ jade-check: $(XMLFILES) jade -E14 -D $(srcdir) -d common/print.dsl -t tex $(srcdir)/common/xml.dcl $(MAINXML) touch jade-check -manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl +manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl local.ent rm -f manref.xml for i in $(XMLMAN); do \ xsltproc $(srcdir)/common/stripref.xsl $(srcdir)/$$i | sed 1d >> manref.xml; \ diff --git a/doc/pazpar2_protocol.xml b/doc/pazpar2_protocol.xml index 9586c3e..12ad723 100644 --- a/doc/pazpar2_protocol.xml +++ b/doc/pazpar2_protocol.xml @@ -47,7 +47,7 @@ Initializes a session. Returns session ID to be used in subsequent requests. If - a server ID is given in the Pazpar2 server section, then a + a server ID is given in the Pazpar2 server section, then that is included in the session ID as suffix after a period (.). diff --git a/etc/default.xml b/etc/default.xml index 66312dd..ec2f82d 100644 --- a/etc/default.xml +++ b/etc/default.xml @@ -2,37 +2,37 @@ - + - + - + - + - + - @@ -66,9 +66,9 @@ - + - + @@ -87,7 +87,7 @@ - + @@ -95,12 +95,12 @@ - + - + diff --git a/etc/mkc.xml b/etc/mkc.xml index 37d4484..2ab7cc4 100644 --- a/etc/mkc.xml +++ b/etc/mkc.xml @@ -16,30 +16,30 @@ - + - + - + - + - @@ -73,9 +73,9 @@ - + - + @@ -94,7 +94,7 @@ - + @@ -102,12 +102,12 @@ - + - + diff --git a/etc/pazpar2.cfg.dist b/etc/pazpar2.cfg.dist index 65dad25..4ec5b08 100644 --- a/etc/pazpar2.cfg.dist +++ b/etc/pazpar2.cfg.dist @@ -1,12 +1,12 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + [[:WhiteSpace:][,.-]]* } [$] > ; + + + + [[:WhiteSpace:][,.-]]* } [$] > ; + + + + + + + + + + + + + + + + + + + diff --git a/test/test_perf.sh b/test/test_perf.sh new file mode 100755 index 0000000..c6fd22c --- /dev/null +++ b/test/test_perf.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +TEST=`basename $0 .sh` +# srcdir might be set by make +srcdir=${srcdir:-"."} + +if test -z "$PERF_PROG"; then + if test -x /usr/bin/time; then + PERF_PROG="/usr/bin/time -p" + fi +fi +exec ${srcdir}/run_pazpar2.sh --ztest --icu $TEST + +# Local Variables: +# mode:shell-script +# sh-indentation: 2 +# sh-basic-offset: 4 +# End: diff --git a/test/test_perf.urls b/test/test_perf.urls new file mode 100644 index 0000000..7b23363 --- /dev/null +++ b/test/test_perf.urls @@ -0,0 +1,5 @@ +http://localhost:9763/search.pz2?command=init&clear=1 +ztest_localhost_settings.xml http://localhost:9763/search.pz2?session=1&command=settings +http://localhost:9763/search.pz2?session=1&command=search&query=100+and+computer +2 w http://localhost:9763/search.pz2?session=1&command=show&block=1 +http://localhost:9763/search.pz2?session=1&command=termlist diff --git a/test/test_perf_1.res b/test/test_perf_1.res new file mode 100644 index 0000000..c09ee34 --- /dev/null +++ b/test/test_perf_1.res @@ -0,0 +1,3 @@ + +OK1150000 + \ No newline at end of file diff --git a/test/test_perf_2.res b/test/test_perf_2.res new file mode 100644 index 0000000..42534e3 --- /dev/null +++ b/test/test_perf_2.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_perf_3.res b/test/test_perf_3.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_perf_3.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_perf_4.res b/test/test_perf_4.res new file mode 100644 index 0000000..dc992a3 --- /dev/null +++ b/test/test_perf_4.res @@ -0,0 +1,260 @@ + +OK +0 +99 +100 +0 +20 + + Internet world + 1992 + Title from caption + + Internet world + 1992 + Title from caption + + 1 + 55113 + content: title internet world + + + How to program a computer + Jack Collins + + How to program a computer + Jack Collins + + + How to program a computer + Jack Collins + + 2 + 33068 + content: title how to program a computer author jack collins + + + The Computer Bible + 1973-1980 + Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates + + The Computer Bible + 1973-1980 + Hebrew and Greek; introductions in English + Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates + + 1 + 27556 + content: title the computer bible + + + Computer science & technology + proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 + 1977 + + Computer science & technology + proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 + 1977 + + 1 + 20667 + content: title computer science technology + + + How to program a computer + Jack C100 + + How to program a computer + Jack C100 + + 1 + 16534 + content: title how to program a computer author jack c100 + + + How to program a computer + Jack C24 + + How to program a computer + Jack C24 + + 1 + 16534 + content: title how to program a computer author jack c24 + + + How to program a computer + Jack C25 + + How to program a computer + Jack C25 + + 1 + 16534 + content: title how to program a computer author jack c25 + + + How to program a computer + Jack C26 + + How to program a computer + Jack C26 + + 1 + 16534 + content: title how to program a computer author jack c26 + + + How to program a computer + Jack C27 + + How to program a computer + Jack C27 + + 1 + 16534 + content: title how to program a computer author jack c27 + + + How to program a computer + Jack C28 + + How to program a computer + Jack C28 + + 1 + 16534 + content: title how to program a computer author jack c28 + + + How to program a computer + Jack C29 + + How to program a computer + Jack C29 + + 1 + 16534 + content: title how to program a computer author jack c29 + + + How to program a computer + Jack C30 + + How to program a computer + Jack C30 + + 1 + 16534 + content: title how to program a computer author jack c30 + + + How to program a computer + Jack C31 + + How to program a computer + Jack C31 + + 1 + 16534 + content: title how to program a computer author jack c31 + + + How to program a computer + Jack C32 + + How to program a computer + Jack C32 + + 1 + 16534 + content: title how to program a computer author jack c32 + + + How to program a computer + Jack C33 + + How to program a computer + Jack C33 + + 1 + 16534 + content: title how to program a computer author jack c33 + + + How to program a computer + Jack C34 + + How to program a computer + Jack C34 + + 1 + 16534 + content: title how to program a computer author jack c34 + + + How to program a computer + Jack C35 + + How to program a computer + Jack C35 + + 1 + 16534 + content: title how to program a computer author jack c35 + + + How to program a computer + Jack C36 + + How to program a computer + Jack C36 + + 1 + 16534 + content: title how to program a computer author jack c36 + + + How to program a computer + Jack C37 + + How to program a computer + Jack C37 + + 1 + 16534 + content: title how to program a computer author jack c37 + + + How to program a computer + Jack C38 + + How to program a computer + Jack C38 + + 1 + 16534 + content: title how to program a computer author jack c38 + + \ No newline at end of file diff --git a/test/test_perf_5.res b/test/test_perf_5.res new file mode 100644 index 0000000..bad0324 --- /dev/null +++ b/test/test_perf_5.res @@ -0,0 +1,61 @@ + +0 + +Jack Collins2 +Adam, James1 +Carter, Bill1 +Englund, Carl R1 +Jack C1001 +Jack C241 +Jack C251 +Jack C261 +Jack C271 +Jack C281 +Jack C291 +Jack C301 +Jack C311 +Jack C321 +Jack C331 + + +19773 +19712 +19742 +19802 +19872 +19912 +19932 +19681 +19721 +19731 +19841 +19861 +19921 + + +Bible5 +Internet (Computer network)2 +United States2 +Bible. O.T1 +Bible. O.T. Deuteronomy1 +Cartography1 +Community colleges1 +Computer Systems1 +Computer networks1 +Computers1 +Demonstration centers in education1 +Dropouts1 +Educational innovations1 +Educational technology1 +FEDLINK (Network)1 + + + +localhost:9999/db1 +db1 +100 +Client_Idle +0 + + + \ No newline at end of file diff --git a/test/test_post.urls b/test/test_post.urls index 3d14bc4..291591e 100644 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/test/test_sort_6.res +++ b/test/test_sort_6.res @@ -10,59 +10,59 @@ -Water-supply370 -Water338 -Groundwater188 -Water resources development186 -Water quality174 -Mineral waters104 -Water quality management100 -United States86 -Irrigation66 -N.Y56 -Hydraulic engineering48 -Geology46 -U.S46 -Groundwater flow44 -Birds42 +Water-supply185 +Water169 +Groundwater94 +Water resources development93 +Water quality87 +Mineral waters52 +Water quality management50 +United States43 +Irrigation33 +N.Y28 +Hydraulic engineering24 +Geology23 +U.S23 +Groundwater flow22 +Birds21 -Waters, Clara Erskine Clement18 -Waters, Henry F16 -Moorman, J. J14 -Waters, Thomas Franklin12 -Basak, P10 -Bergren, Lisa Tawn10 -Kingsley, Charles10 -Tyndall, John10 -Baldwin, William J8 -Holme, Charles8 -James, E. J8 -Nuttall, Thomas8 -Walton, George Edward8 -Wilkins, John H8 -Arthur, Kay6 +Waters, Clara Erskine Clement9 +Waters, Henry F8 +Moorman, J. J7 +Waters, Thomas Franklin6 +Basak, P5 +Bergren, Lisa Tawn5 +Kingsley, Charles5 +Tyndall, John5 +Baldwin, William J4 +Holme, Charles4 +James, E. J4 +Nuttall, Thomas4 +Walton, George Edward4 +Wilkins, John H4 +Arthur, Kay3 -2000822 -1999636 -1998180 -2001174 -1907100 -190292 -190686 -190578 -190978 -190472 -199770 -190866 -199664 -190360 -190158 +2000411 +1999318 +199890 +200187 +190750 +190246 +190643 +190539 +190939 +190436 +199735 +190833 +199632 +190330 +190129 -book3968 -web16 -book (electronic)6 +book1984 +web8 +book (electronic)3 \ No newline at end of file diff --git a/test/test_sort_settings.xml b/test/test_sort_settings.xml index f22d1dd..a970cff 100644 --- a/test/test_sort_settings.xml +++ b/test/test_sort_settings.xml @@ -35,10 +35,6 @@ - - - - diff --git a/test/test_sru-proxy.urls b/test/test_sru-proxy.urls index 6f8276e..3adc833 100644 --- 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 --- 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 --- 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 --- 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 --- 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 diff --git a/win/makefile b/win/makefile index 6460a66..bd847df 100644 --- a/win/makefile +++ b/win/makefile @@ -5,7 +5,7 @@ DEBUG=0 # 0 for release, 1 for debug USE_MANIFEST = 1 # Can be enabled Visual Studio 2005/2008 PACKAGE_NAME=pazpar2 -PACKAGE_VERSION=1.7.0 +PACKAGE_VERSION=1.7.2 # YAZ YAZ_DIR=..\..\yaz -- 1.7.10.4