Jason Skomorowski [Tue, 29 Sep 2009 18:56:44 +0000 (14:56 -0400)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Tue, 29 Sep 2009 13:46:01 +0000 (15:46 +0200)]
Same fname scheme for mmap+xslt
Adam Dickmeiss [Tue, 29 Sep 2009 13:45:12 +0000 (15:45 +0200)]
Is retired. Really.
Adam Dickmeiss [Tue, 29 Sep 2009 13:20:15 +0000 (15:20 +0200)]
Change proto to use const char ptr
Adam Dickmeiss [Tue, 29 Sep 2009 11:38:51 +0000 (13:38 +0200)]
Fix timeout setting to use operation
Adam Dickmeiss [Tue, 29 Sep 2009 09:18:34 +0000 (11:18 +0200)]
Different approach to selecting medium.
Instead of substring-after/substring-before, just remove "white-space"
chars - such as "[]/ " . At least one target has been seen to use / in
245$h.
Adam Dickmeiss [Tue, 29 Sep 2009 08:23:56 +0000 (10:23 +0200)]
Log SHA1 version on start
Adam Dickmeiss [Tue, 29 Sep 2009 07:48:22 +0000 (09:48 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Tue, 29 Sep 2009 07:46:11 +0000 (09:46 +0200)]
Introduce Z39.50/SRU operation timeout.
Introduce operations timeout. It replaces connect timeout and is the
maximum waiting time before giving up an active operation. Its
default value is 30 seconds.
Adam Dickmeiss [Mon, 28 Sep 2009 21:46:26 +0000 (23:46 +0200)]
Fix for non-threaded resolver.
For the non-threaded host resolver, create_host may return NULL. This
in turn will make database-host a NULL ptr. This fixes
client_prep_connection to return if that's the case.
Adam Dickmeiss [Mon, 28 Sep 2009 18:36:42 +0000 (20:36 +0200)]
Update for different -V output
Pazpar2 -V now shows icu:enabled if ICU is enabled.
Adam Dickmeiss [Mon, 28 Sep 2009 18:18:50 +0000 (20:18 +0200)]
pz:recordfilter form is name[=substring].
pz:recordfilter is now of the form name[=substring]. A record is
included if metadata element is present and existing (substring
omitted) or includes substring (substring included).
Adam Dickmeiss [Mon, 28 Sep 2009 11:56:27 +0000 (13:56 +0200)]
Mergekey from XSL overrides mergekey=yes.
If mergekey attribute is present in XSL (px:xslt), then value for that
is used (and value of elements defined in metadata mergekey=yes are not
used). OIf mergekey is not present, then value of metadata mergekey=yes
elements are used. An empty value mergekey from XSL will generate
a unique mergekey.
Adam Dickmeiss [Mon, 28 Sep 2009 11:22:19 +0000 (13:22 +0200)]
JS: Use generic array for stats data.
The stat response data is now stored in an array based on element names.
This allow us to not keep in "sync" with the Pazpar2 response which changed
from 1.0.13 to 1.1.0.
Adam Dickmeiss [Mon, 28 Sep 2009 10:16:48 +0000 (12:16 +0200)]
Comma separated value for pz:recordfilter.
Adam Dickmeiss [Mon, 28 Sep 2009 08:54:36 +0000 (10:54 +0200)]
Implemented pz:recordfilter facility.
Value of pz:recordfilter may only have one element for now.
Adam Dickmeiss [Mon, 28 Sep 2009 07:42:03 +0000 (09:42 +0200)]
Change show version (-V) WRT ICU
Jason Skomorowski [Fri, 25 Sep 2009 21:22:32 +0000 (17:22 -0400)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Jason Skomorowski [Fri, 25 Sep 2009 21:14:43 +0000 (17:14 -0400)]
MARC map, documented.
Adam Dickmeiss [Fri, 25 Sep 2009 13:24:07 +0000 (15:24 +0200)]
Setting files moved to etc/settings.
Setting XML files are now stored in etc/settings instead of etc. This
reflects the layout with the Debian package layout.
Adam Dickmeiss [Fri, 25 Sep 2009 13:23:55 +0000 (15:23 +0200)]
Include mmap files in Windows package
Adam Dickmeiss [Fri, 25 Sep 2009 12:22:29 +0000 (14:22 +0200)]
Add timeout settings in sample config
Adam Dickmeiss [Fri, 25 Sep 2009 12:11:14 +0000 (14:11 +0200)]
Omit etc/pazpar2.cfg from dist
Adam Dickmeiss [Fri, 25 Sep 2009 12:08:36 +0000 (14:08 +0200)]
Update ignore files.
Adam Dickmeiss [Fri, 25 Sep 2009 11:33:53 +0000 (13:33 +0200)]
Add AC_C_INLINE
Adam Dickmeiss [Fri, 25 Sep 2009 11:33:37 +0000 (13:33 +0200)]
disable inline if AC_C_INLINE is not in use
Adam Dickmeiss [Fri, 25 Sep 2009 08:37:54 +0000 (10:37 +0200)]
Mods for Windows compilation
Adam Dickmeiss [Fri, 25 Sep 2009 07:57:36 +0000 (09:57 +0200)]
Mark inline functions static.
Mark the strtrimcat and strtrimcpy static. This fixes compilation of
Pazpar2 for Sun Studio C.
Adam Dickmeiss [Thu, 24 Sep 2009 19:06:30 +0000 (21:06 +0200)]
Add test result (test_post_7).
Adam Dickmeiss [Thu, 24 Sep 2009 13:06:35 +0000 (15:06 +0200)]
POST of target settings.
Command settings now looks for posted content , content-type=text/xml,
in which case that is XML parsed in the same way as "static" target
settings.
Adam Dickmeiss [Thu, 24 Sep 2009 13:06:04 +0000 (15:06 +0200)]
Do not include util.h (deleted)
Adam Dickmeiss [Thu, 24 Sep 2009 11:08:30 +0000 (13:08 +0200)]
Fix leaks for marchash_ingest_marcxml
Adam Dickmeiss [Thu, 24 Sep 2009 11:08:02 +0000 (13:08 +0200)]
Fix leak for show raw
Adam Dickmeiss [Thu, 24 Sep 2009 08:13:36 +0000 (10:13 +0200)]
Test POST of one more service.
Adam Dickmeiss [Thu, 24 Sep 2009 08:03:55 +0000 (10:03 +0200)]
Update tests - embedded settings in service.
The gils_service.xml now has settings embedded. The pz:name of GILS
and MARC server has been changed. And so, expected test results are
updated.
Adam Dickmeiss [Thu, 24 Sep 2009 07:40:53 +0000 (09:40 +0200)]
Fix connect timeout problem on Solaris.
This problem was seen on Solaris but could happen anywhere. Pazpar2
did not detect that Connection was established. And consequently did
not change timeout from 'Z39.50 connect timeout' to 'Z39.50 session
timeout'. Since The former is only 15 seconds by default a slow search
would be aborted when it shouldn't. This commit removes a call to
ZOOM_connection_process which, on Solaris, would grab one or more
events out, so that Pazpar2 was not informed.
Adam Dickmeiss [Thu, 24 Sep 2009 07:33:58 +0000 (09:33 +0200)]
Update test results.
Adam Dickmeiss [Thu, 24 Sep 2009 07:11:01 +0000 (09:11 +0200)]
Fix calls to wget for first time test.
Adam Dickmeiss [Thu, 24 Sep 2009 07:10:42 +0000 (09:10 +0200)]
Smaller Pazpar2 config
Adam Dickmeiss [Thu, 24 Sep 2009 07:10:05 +0000 (09:10 +0200)]
Slightly more wait for test_post
Adam Dickmeiss [Thu, 24 Sep 2009 06:41:30 +0000 (08:41 +0200)]
Add test for POST of service.
Add test script, config files, etc for POST of service for command=init.
These were accidently omitted in commit
fdf549621a2712e2e7fafd5966bbbf9a5c891adf.
Adam Dickmeiss [Wed, 23 Sep 2009 14:16:06 +0000 (16:16 +0200)]
Service may be POSTed for command=init.
A service may be posted for command=init. This service will be used
during the session. The service may have its own target settings,
ICU config, timeout, etc. In order to be recognized, the POST request
must use Content-Type=text/xml.
Adam Dickmeiss [Wed, 23 Sep 2009 14:09:43 +0000 (16:09 +0200)]
Fix session in some tests.
Adam Dickmeiss [Wed, 23 Sep 2009 12:29:48 +0000 (14:29 +0200)]
Re-structure conf/server/service ptrs
Adam Dickmeiss [Wed, 23 Sep 2009 11:21:40 +0000 (13:21 +0200)]
Windows: update for new source.
Adam Dickmeiss [Wed, 23 Sep 2009 11:20:35 +0000 (13:20 +0200)]
Add include of config.h
Adam Dickmeiss [Wed, 23 Sep 2009 11:19:18 +0000 (13:19 +0200)]
DRY out multiple hash functions.
Jenkins hash function now in one place.
Adam Dickmeiss [Wed, 23 Sep 2009 11:10:20 +0000 (13:10 +0200)]
Clean-up to avoid GCC warnings, constify.
Adam Dickmeiss [Wed, 23 Sep 2009 10:46:03 +0000 (12:46 +0200)]
Header+footer for mmap stuff
Adam Dickmeiss [Wed, 23 Sep 2009 10:41:39 +0000 (12:41 +0200)]
More clean-up (remove util.c).
Adam Dickmeiss [Wed, 23 Sep 2009 10:17:11 +0000 (12:17 +0200)]
Timeout per-service, obsoletes -T
Timeout values may be given per-service. That's element 'timeout'
which takes three attribute values (a subset may be given): 'session',
'z3950_connect', 'z3950_session'. Option -T is no longer supported
- used to specify session timeout.
Adam Dickmeiss [Wed, 23 Sep 2009 08:49:59 +0000 (10:49 +0200)]
Refactor. Make private functions static.
Adam Dickmeiss [Wed, 23 Sep 2009 07:54:18 +0000 (09:54 +0200)]
Remove unused code
Adam Dickmeiss [Wed, 23 Sep 2009 07:53:54 +0000 (09:53 +0200)]
Rename function
Adam Dickmeiss [Mon, 21 Sep 2009 14:17:12 +0000 (16:17 +0200)]
Add test for marc map
Jason Skomorowski [Fri, 18 Sep 2009 14:41:34 +0000 (10:41 -0400)]
Merge branch 'master' of git://git.indexdata.com/pazpar2
Conflicts:
src/logic.c
Jason Skomorowski [Fri, 18 Sep 2009 14:02:19 +0000 (10:02 -0400)]
First stab at a marc map as a fast alternat to XSLT
Adam Dickmeiss [Fri, 18 Sep 2009 10:43:57 +0000 (12:43 +0200)]
Remove unused member
Adam Dickmeiss [Fri, 18 Sep 2009 08:00:00 +0000 (10:00 +0200)]
Remove unused global: timeout
Adam Dickmeiss [Thu, 17 Sep 2009 10:17:05 +0000 (12:17 +0200)]
Remove us1 targets
Adam Dickmeiss [Thu, 17 Sep 2009 09:24:56 +0000 (11:24 +0200)]
Update WRT settings, relevance etc.
Adam Dickmeiss [Thu, 17 Sep 2009 09:24:02 +0000 (11:24 +0200)]
Update test1 to not use option -t.
Adam Dickmeiss [Thu, 17 Sep 2009 09:16:03 +0000 (11:16 +0200)]
Character normalization per-service.
The elements 'relevance', 'sort', 'mergekey' may now be given
inside service element as well as server. The server elements are
for a service if it does not specify the normalization itself.
The settings and normalization info is now inheried to each service
in a separate pass to ensure that order does not matter.
Adam Dickmeiss [Wed, 16 Sep 2009 12:00:23 +0000 (14:00 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Wed, 16 Sep 2009 11:58:34 +0000 (13:58 +0200)]
Fix install doc rule for Automake 1.11
Sebastian Hammer [Tue, 15 Sep 2009 02:32:04 +0000 (02:32 +0000)]
Added pz:sort setting
Adam Dickmeiss [Thu, 10 Sep 2009 13:31:55 +0000 (15:31 +0200)]
Release NMEM when config cant be read
Adam Dickmeiss [Thu, 10 Sep 2009 13:30:47 +0000 (15:30 +0200)]
Fix leak in pp2_charset_destroy
Adam Dickmeiss [Thu, 10 Sep 2009 13:29:57 +0000 (15:29 +0200)]
Fix leak in load_database.
This leak is small but seems to have been there for quite some time.
Adam Dickmeiss [Thu, 10 Sep 2009 13:02:18 +0000 (15:02 +0200)]
Embeddable settings (repeatable).
The settings element may be be included verbatim in a service and it
is repeatable. This pretty makes settings with the src attribute
obsolete because of the include facility.
Adam Dickmeiss [Thu, 10 Sep 2009 10:56:14 +0000 (12:56 +0200)]
More strict metadata assignment code
Adam Dickmeiss [Thu, 10 Sep 2009 10:55:46 +0000 (12:55 +0200)]
Refactor read_settings_file
Adam Dickmeiss [Thu, 10 Sep 2009 10:50:55 +0000 (12:50 +0200)]
Get rid of useless tests.
Adam Dickmeiss [Thu, 10 Sep 2009 10:34:17 +0000 (12:34 +0200)]
Remove proxy override.
The proxy override global and now local variable has not been configurable
ever. So this code can be safely removed.
Adam Dickmeiss [Thu, 10 Sep 2009 10:30:44 +0000 (12:30 +0200)]
Add check of configuration (-t).
Option -t tests the Pazpar2 configuration and returns exit code
(0=success, non-zero=failure). The configuration is dumped to the yaz
log file if -d is given. Previously the configuration was dumped always
to stdout.
Adam Dickmeiss [Thu, 10 Sep 2009 09:19:37 +0000 (11:19 +0200)]
Remove support for option -t.
Option -t allows a settings file to be given on the command line.
This patch removes that facility. It is a rarely used facility.
Adam Dickmeiss [Thu, 10 Sep 2009 08:45:01 +0000 (10:45 +0200)]
Rephrase
Adam Dickmeiss [Thu, 10 Sep 2009 08:40:35 +0000 (10:40 +0200)]
Version 1.2.0
Adam Dickmeiss [Thu, 10 Sep 2009 08:38:17 +0000 (10:38 +0200)]
Describe include facility
Adam Dickmeiss [Thu, 10 Sep 2009 08:19:03 +0000 (10:19 +0200)]
Mention multiple services/servers.
Adam Dickmeiss [Wed, 9 Sep 2009 14:15:10 +0000 (16:15 +0200)]
Dont wait for record command if active clients==0.
Adam Dickmeiss [Wed, 9 Sep 2009 13:23:04 +0000 (15:23 +0200)]
Windows port fixes
Adam Dickmeiss [Wed, 9 Sep 2009 12:38:41 +0000 (14:38 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Wed, 9 Sep 2009 12:35:25 +0000 (14:35 +0200)]
Extend config include for glob-patterns.
The Pazpar2 configuration may now have an 'include' everywhere, except
in settings files. The attribute 'src' of 'include' is now a glob
pattern. The pattern, if relative, is prepended with the path of the main
configuration file as before, for example <include src="conf.d/*.xml"/>.
Adam Dickmeiss [Wed, 9 Sep 2009 12:27:33 +0000 (14:27 +0200)]
Extend config include for glob-patterns.
The Pazpar2 configuration may now have an 'include' everywhere, except
in settings files. The attribute 'src' of 'include' is now a glob pattern.
The pattern, if relative, is prepended with the path of the main
configuration file as before, for example <include src="conf.d/*.xml"/>
Adam Dickmeiss [Wed, 9 Sep 2009 12:05:05 +0000 (14:05 +0200)]
Add check for glob.h
Adam Dickmeiss [Wed, 9 Sep 2009 12:03:57 +0000 (14:03 +0200)]
Fix handling of bad config
Adam Dickmeiss [Wed, 9 Sep 2009 12:02:43 +0000 (14:02 +0200)]
Ref count pp2_charset_t
Adam Dickmeiss [Tue, 8 Sep 2009 14:27:13 +0000 (16:27 +0200)]
Test uses include of a service.
Adam Dickmeiss [Tue, 8 Sep 2009 14:26:24 +0000 (16:26 +0200)]
Beginnings of generic include.
Adam Dickmeiss [Tue, 8 Sep 2009 12:26:19 +0000 (14:26 +0200)]
Dont ignore old programs
Adam Dickmeiss [Tue, 8 Sep 2009 12:23:35 +0000 (14:23 +0200)]
Avoid extern when a header just does it
Adam Dickmeiss [Tue, 8 Sep 2009 12:19:47 +0000 (14:19 +0200)]
const some arguments. Remove http_command.h
Adam Dickmeiss [Tue, 8 Sep 2009 12:06:59 +0000 (14:06 +0200)]
Annocate static vars left
Adam Dickmeiss [Tue, 8 Sep 2009 11:51:02 +0000 (13:51 +0200)]
Refactor to avoid more static variables
Move listener_socket to conf_server. It was static before and that
would have given problems with multiple servers (multiple listeners).
The WRBUF confdir is now part of conf_config and no longer static. Move
conf_config to pazpar2_config.c because it is no longer needed by other
modules.
Adam Dickmeiss [Tue, 8 Sep 2009 09:09:50 +0000 (11:09 +0200)]
Proxy per-server. Clean various fixed size bufs.
Adam Dickmeiss [Tue, 8 Sep 2009 08:54:30 +0000 (10:54 +0200)]
Remove targetprofiles from test
Adam Dickmeiss [Tue, 8 Sep 2009 07:48:50 +0000 (09:48 +0200)]
Targetprofiles part of service.
The 'targetprofiles' element, if present, must be defined inside
'service' rather than in 'pazpar2' (global).
Adam Dickmeiss [Tue, 8 Sep 2009 07:48:37 +0000 (09:48 +0200)]
Remove unused settings in test
Adam Dickmeiss [Tue, 8 Sep 2009 07:29:07 +0000 (09:29 +0200)]
Remove unused global parameter: chunk