From: Mike Taylor Date: Mon, 11 Aug 2014 16:53:11 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 X-Git-Tag: v1.7.1~15 X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=119ed9864c20c01cdac70c8831a636b2c847c25c;hp=36afcbab037965e2ca1ac6fcc6a8796ec56e4726;p=pazpar2-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2 --- diff --git a/IDMETA b/IDMETA index c6330e9..08bd2fd 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 saucy raring quantal precise" CENTOS_DIST="centos5 centos6" VERSION=1.7.0 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/src/session.c b/src/session.c index 6d7ab65..eac40a0 100644 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/test/test_http_45.res +++ b/test/test_http_45.res @@ -14,7 +14,7 @@ Imaging systems in medicine Includes bibliographical references and index + name="marc" checksum="2614320583"> Computer processing of dynamic images from an Anger scintillation camera the proceedings of a workshop 1974 @@ -25,15 +25,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Radioisotope scanning - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Scintillation cameras - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Imaging systems in medicine - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 0 diff --git a/test/test_http_49.res b/test/test_http_49.res index 9832043..4c1f533 100644 --- a/test/test_http_49.res +++ b/test/test_http_49.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 124766 diff --git a/test/test_http_50.res b/test/test_http_50.res index fa73966..2b2fb5b 100644 --- a/test/test_http_50.res +++ b/test/test_http_50.res @@ -14,7 +14,7 @@ Imaging systems in medicine Includes bibliographical references and index + name="marc" checksum="2614320583"> Computer processing of dynamic images from an Anger scintillation camera the proceedings of a workshop 1974 @@ -25,15 +25,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Radioisotope scanning - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Scintillation cameras - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Imaging systems in medicine - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 0 diff --git a/test/test_http_60.res b/test/test_http_60.res index 99b482c..298cdb2 100644 --- a/test/test_http_60.res +++ b/test/test_http_60.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 291121 diff --git a/test/test_http_63.res b/test/test_http_63.res index 99b482c..298cdb2 100644 --- a/test/test_http_63.res +++ b/test/test_http_63.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 291121 diff --git a/test/test_http_65.res b/test/test_http_65.res index b24d50f..efe653d 100644 --- a/test/test_http_65.res +++ b/test/test_http_65.res @@ -1,7 +1,7 @@ OK z3950.indexdata.com/marc -Index Data MARC test server +marc 1 0 1 diff --git a/test/test_http_66.res b/test/test_http_66.res index 99b482c..298cdb2 100644 --- a/test/test_http_66.res +++ b/test/test_http_66.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 291121 diff --git a/test/test_http_71.res b/test/test_http_71.res index b24d50f..efe653d 100644 --- a/test/test_http_71.res +++ b/test/test_http_71.res @@ -1,7 +1,7 @@ OK z3950.indexdata.com/marc -Index Data MARC test server +marc 1 0 1 diff --git a/test/test_http_72.res b/test/test_http_72.res index 99b482c..298cdb2 100644 --- a/test/test_http_72.res +++ b/test/test_http_72.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 291121 diff --git a/test/test_http_74.res b/test/test_http_74.res index a105782..698a09e 100644 --- a/test/test_http_74.res +++ b/test/test_http_74.res @@ -13,7 +13,7 @@ Railroads "Contract DOT-UT-10003." + name="marc" checksum="4007858895"> Washington metropolitan area rail computer feasibility study; final report 1971 @@ -23,9 +23,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Railroads - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 59412 diff --git a/test/test_http_76.res b/test/test_http_76.res index 4d7509d..ad132e9 100644 --- a/test/test_http_76.res +++ b/test/test_http_76.res @@ -11,7 +11,7 @@ 1977 Optical pattern recognition + name="marc" checksum="3659474317"> Computer science & technology proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 @@ -19,9 +19,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Optical pattern recognition - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 102165 @@ -43,7 +40,7 @@ score = relevance(102165); Bible Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates + name="marc" checksum="3136897450"> The Computer Bible 1973-1980 Bible. O.T @@ -73,7 +70,7 @@ score = relevance(102165); Wood, Helen M Computers + name="marc" checksum="3833666606"> The use of passwords for controlled access to computer resources 1977 Wood, Helen M @@ -81,9 +78,6 @@ score = relevance(102165); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Computers - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 30649 @@ -105,7 +99,7 @@ score = relevance(30649); Tomography Includes bibliographical references and index + name="marc" checksum="3485282028"> Reconstruction tomography in diagnostic radiology and nuclear medicine proceedings of the workshop 1977 @@ -114,9 +108,6 @@ score = relevance(30649); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Tomography - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 0 diff --git a/test/test_http_79.res b/test/test_http_79.res index ced6941..3bbbe07 100644 --- a/test/test_http_79.res +++ b/test/test_http_79.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 60819 @@ -53,7 +47,7 @@ score = relevance(60819); Smith, George Adam Bible + name="marc" checksum="2788512872"> Four psalms XXIII, XXXVI, LII, CXXI 1980 diff --git a/test/test_http_81.res b/test/test_http_81.res index ace9c5e..4633a6c 100644 --- a/test/test_http_81.res +++ b/test/test_http_81.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 48655 @@ -56,7 +50,7 @@ score = relevance(48655); Federal aid to education "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"--T.p. verso + name="marc" checksum="2788512872"> Technology programs that work 1984 United States @@ -70,12 +64,6 @@ score = relevance(48655); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Educational technology - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Federal aid to education - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 4054 diff --git a/test/test_http_82.res b/test/test_http_82.res index fa5a350..d7bc82b 100644 --- a/test/test_http_82.res +++ b/test/test_http_82.res @@ -18,7 +18,7 @@ z3950.indexdata.com/marc -Index Data MARC test server +marc 2 Client_Idle 0 diff --git a/test/test_http_84.res b/test/test_http_84.res index 4f857e5..530d935 100644 --- a/test/test_http_84.res +++ b/test/test_http_84.res @@ -14,7 +14,7 @@ Greece Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures + name="marc" checksum="2614320583"> The religious teachers of Greece 1972 Adam, James @@ -26,12 +26,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Greek literature - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Philosophy, Ancient - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 48655 diff --git a/test/test_http_88.res b/test/test_http_88.res index ced51fb..890a78d 100644 --- a/test/test_http_88.res +++ b/test/test_http_88.res @@ -9,7 +9,7 @@ How to program a computer Jack Collins + name="marc" checksum="2614320583"> How to program a computer Jack Collins XXXXXXXXXX @@ -17,7 +17,7 @@ YYYYYYYYY + name="marc" checksum="2788512872"> How to program a computer Jack Collins XXXXXXXXXX @@ -46,7 +46,7 @@ score = relevance(48160); 1977 Optical pattern recognition + name="marc" checksum="3659474317"> Computer science & technology proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 @@ -54,9 +54,6 @@ score = relevance(48160); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Optical pattern recognition - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 40134 @@ -78,7 +75,7 @@ score = relevance(40134); Bible Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates + name="marc" checksum="3136897450"> The Computer Bible 1973-1980 Bible. O.T @@ -109,7 +106,7 @@ score = relevance(40134); Community colleges Cover title + name="marc" checksum="4182051184"> A plan for community college computer development 1971 Universities and colleges @@ -118,12 +115,6 @@ score = relevance(40134); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Universities and colleges - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Community colleges - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 17200 @@ -146,7 +137,7 @@ score = relevance(17200); Railroads "Contract DOT-UT-10003." + name="marc" checksum="4007858895"> Washington metropolitan area rail computer feasibility study; final report 1971 @@ -156,9 +147,6 @@ score = relevance(17200); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Railroads - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 17200 @@ -182,7 +170,7 @@ score = relevance(17200); Puget Sound region (Wash.) Scale of maps ca. 1:1,000,000 + name="marc" checksum="3311089739"> The Puget Sound Region a portfolio of thematic computer maps 1974 @@ -194,9 +182,6 @@ score = relevance(17200); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Cartography - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 16722 @@ -220,7 +205,7 @@ score = relevance(16722); Imaging systems in medicine Includes bibliographical references and index + name="marc" checksum="2962705161"> Computer processing of dynamic images from an Anger scintillation camera the proceedings of a workshop 1974 @@ -231,15 +216,6 @@ score = relevance(16722); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Radioisotope scanning - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Scintillation cameras - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Imaging systems in medicine - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 12040 @@ -260,7 +236,7 @@ score = relevance(12040); Wood, Helen M Computers + name="marc" checksum="3833666606"> The use of passwords for controlled access to computer resources 1977 Wood, Helen M @@ -268,9 +244,6 @@ score = relevance(12040); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Computers - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 12040 @@ -292,7 +265,7 @@ score = relevance(12040); Tomography Includes bibliographical references and index + name="marc" checksum="3485282028"> Reconstruction tomography in diagnostic radiology and nuclear medicine proceedings of the workshop 1977 @@ -301,9 +274,6 @@ score = relevance(12040); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Tomography - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 0 diff --git a/test/test_http_89.res b/test/test_http_89.res index 9bb5d30..b91efcb 100644 --- a/test/test_http_89.res +++ b/test/test_http_89.res @@ -17,7 +17,7 @@ Community colleges "Contract DOT-UT-10003." + name="marc" checksum="3659474317"> Computer science & technology proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 @@ -25,12 +25,9 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Optical pattern recognition - PAZPAR2_NULL_b - PAZPAR2_NULL_c + name="marc" checksum="3833666606"> The use of passwords for controlled access to computer resources 1977 Wood, Helen M @@ -38,12 +35,9 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Computers - PAZPAR2_NULL_b - PAZPAR2_NULL_c + name="marc" checksum="4007858895"> Washington metropolitan area rail computer feasibility study; final report 1971 @@ -53,12 +47,9 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Railroads - PAZPAR2_NULL_b - PAZPAR2_NULL_c + name="marc" checksum="4182051184"> A plan for community college computer development 1971 Universities and colleges @@ -67,12 +58,6 @@ XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Universities and colleges - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Community colleges - PAZPAR2_NULL_b - PAZPAR2_NULL_c 4 41119 @@ -111,7 +96,7 @@ score = relevance(41119); Tomography Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates + name="marc" checksum="2962705161"> Computer processing of dynamic images from an Anger scintillation camera the proceedings of a workshop 1974 @@ -122,18 +107,9 @@ score = relevance(41119); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Radioisotope scanning - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Scintillation cameras - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Imaging systems in medicine - PAZPAR2_NULL_b - PAZPAR2_NULL_c + name="marc" checksum="3136897450"> The Computer Bible 1973-1980 Bible. O.T @@ -145,7 +121,7 @@ score = relevance(41119); YYYYYYYYY + name="marc" checksum="3311089739"> The Puget Sound Region a portfolio of thematic computer maps 1974 @@ -157,12 +133,9 @@ score = relevance(41119); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Cartography - PAZPAR2_NULL_b - PAZPAR2_NULL_c + name="marc" checksum="3485282028"> Reconstruction tomography in diagnostic radiology and nuclear medicine proceedings of the workshop 1977 @@ -171,9 +144,6 @@ score = relevance(41119); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Tomography - PAZPAR2_NULL_b - PAZPAR2_NULL_c 4 32723 @@ -198,7 +168,7 @@ score = relevance(32723); How to program a computer Jack Collins + name="marc" checksum="2614320583"> How to program a computer Jack Collins XXXXXXXXXX @@ -222,7 +192,7 @@ score = relevance(11437); How to program a computer Jack Collins + name="marc" checksum="2788512872"> How to program a computer Jack Collins XXXXXXXXXX diff --git a/test/test_http_90.res b/test/test_http_90.res index 480b05e..86487ca 100644 --- a/test/test_http_90.res +++ b/test/test_http_90.res @@ -9,7 +9,7 @@ How to program a computer Jack Collins + name="marc" checksum="2614320583"> How to program a computer Jack Collins XXXXXXXXXX @@ -17,7 +17,7 @@ YYYYYYYYY + name="marc" checksum="2788512872"> How to program a computer Jack Collins XXXXXXXXXX @@ -46,7 +46,7 @@ score = relevance(48160); 1977 Optical pattern recognition + name="marc" checksum="3659474317"> Computer science & technology proceedings of a workshop held at the National Bureau of Standards, Gaithersburg, MD, June 3-4, 1976 1977 @@ -54,9 +54,6 @@ score = relevance(48160); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Optical pattern recognition - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 40134 @@ -78,7 +75,7 @@ score = relevance(40134); Bible Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates + name="marc" checksum="3136897450"> The Computer Bible 1973-1980 Bible. O.T @@ -109,7 +106,7 @@ score = relevance(40134); Community colleges Cover title + name="marc" checksum="4182051184"> A plan for community college computer development 1971 Universities and colleges @@ -118,12 +115,6 @@ score = relevance(40134); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Universities and colleges - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Community colleges - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 17200 @@ -146,7 +137,7 @@ score = relevance(17200); Railroads "Contract DOT-UT-10003." + name="marc" checksum="4007858895"> Washington metropolitan area rail computer feasibility study; final report 1971 @@ -156,9 +147,6 @@ score = relevance(17200); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Railroads - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 17200 @@ -182,7 +170,7 @@ score = relevance(17200); Puget Sound region (Wash.) Scale of maps ca. 1:1,000,000 + name="marc" checksum="3311089739"> The Puget Sound Region a portfolio of thematic computer maps 1974 @@ -194,9 +182,6 @@ score = relevance(17200); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Cartography - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 16722 @@ -220,7 +205,7 @@ score = relevance(16722); Imaging systems in medicine Includes bibliographical references and index + name="marc" checksum="2962705161"> Computer processing of dynamic images from an Anger scintillation camera the proceedings of a workshop 1974 @@ -231,15 +216,6 @@ score = relevance(16722); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Radioisotope scanning - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Scintillation cameras - PAZPAR2_NULL_b - PAZPAR2_NULL_c - Imaging systems in medicine - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 12040 @@ -260,7 +236,7 @@ score = relevance(12040); Wood, Helen M Computers + name="marc" checksum="3833666606"> The use of passwords for controlled access to computer resources 1977 Wood, Helen M @@ -268,9 +244,6 @@ score = relevance(12040); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Computers - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 12040 @@ -292,7 +265,7 @@ score = relevance(12040); Tomography Includes bibliographical references and index + name="marc" checksum="3485282028"> Reconstruction tomography in diagnostic radiology and nuclear medicine proceedings of the workshop 1977 @@ -301,9 +274,6 @@ score = relevance(12040); XXXXXXXXXX test-usersetting-2 data: YYYYYYYYY - Tomography - PAZPAR2_NULL_b - PAZPAR2_NULL_c 1 0 diff --git a/test/test_icu.urls b/test/test_icu.urls index be4e983..fefa859 100644 --- 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 --- 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 --- 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 --- 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 --- a/test/test_perf_4.res +++ b/test/test_perf_4.res @@ -1,7 +1,7 @@ OK -1 -39 +0 +99 100 0 20 @@ -16,7 +16,7 @@ Title from caption 1 - 152547 + 55113 content: title internet world @@ -33,7 +33,7 @@ Jack Collins 2 - 91528 + 33068 content: title how to program a computer author jack collins @@ -48,7 +48,7 @@ Vols. 2, 8: Missoula, Mont. : Published by Scholars Press for Biblical Research Associates 1 - 76273 + 27556 content: title the computer bible @@ -62,11 +62,23 @@ 1977 1 - 57205 + 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 @@ -74,7 +86,7 @@ Jack C24 1 - 45764 + 16534 content: title how to program a computer author jack c24 @@ -86,7 +98,7 @@ Jack C25 1 - 45764 + 16534 content: title how to program a computer author jack c25 @@ -98,7 +110,7 @@ Jack C26 1 - 45764 + 16534 content: title how to program a computer author jack c26 @@ -110,7 +122,7 @@ Jack C27 1 - 45764 + 16534 content: title how to program a computer author jack c27 @@ -122,7 +134,7 @@ Jack C28 1 - 45764 + 16534 content: title how to program a computer author jack c28 @@ -134,7 +146,7 @@ Jack C29 1 - 45764 + 16534 content: title how to program a computer author jack c29 @@ -146,7 +158,7 @@ Jack C30 1 - 45764 + 16534 content: title how to program a computer author jack c30 @@ -158,7 +170,7 @@ Jack C31 1 - 45764 + 16534 content: title how to program a computer author jack c31 @@ -170,7 +182,7 @@ Jack C32 1 - 45764 + 16534 content: title how to program a computer author jack c32 @@ -182,7 +194,7 @@ Jack C33 1 - 45764 + 16534 content: title how to program a computer author jack c33 @@ -194,7 +206,7 @@ Jack C34 1 - 45764 + 16534 content: title how to program a computer author jack c34 @@ -206,7 +218,7 @@ Jack C35 1 - 45764 + 16534 content: title how to program a computer author jack c35 @@ -218,7 +230,7 @@ Jack C36 1 - 45764 + 16534 content: title how to program a computer author jack c36 @@ -230,7 +242,7 @@ Jack C37 1 - 45764 + 16534 content: title how to program a computer author jack c37 @@ -242,19 +254,7 @@ Jack C38 1 - 45764 + 16534 content: title how to program a computer author jack c38 - - How to program a computer - Jack C39 - - How to program a computer - Jack C39 - - 1 - 45764 - content: title how to program a computer author jack c39 - \ 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