Adam Dickmeiss [Fri, 9 Oct 2009 13:14:41 +0000 (15:14 +0200)]
Fixed size hash for some structures.
Fixed size hash lists for termlists, reclists.. Remove global variable
parameters.toget.
Adam Dickmeiss [Thu, 8 Oct 2009 20:32:14 +0000 (22:32 +0200)]
Preserve order for insertion in reclist
Preserve for reclist insertion so that tests give same result.
Before this commit, results were correct but sorting would be
different for identical sortkeys (unstable sort).
Adam Dickmeiss [Thu, 8 Oct 2009 13:56:18 +0000 (15:56 +0200)]
Reclists work.
Adam Dickmeiss [Thu, 8 Oct 2009 13:01:18 +0000 (15:01 +0200)]
Remove unused code
Adam Dickmeiss [Thu, 8 Oct 2009 12:52:34 +0000 (14:52 +0200)]
Refactor: hide reclist structure
Adam Dickmeiss [Thu, 8 Oct 2009 10:47:48 +0000 (12:47 +0200)]
Substring for all setting types.
Change match_criterion so that substring (~) match uses strstr
always. The equal/string (=) uses match_zurl magic and strcmp as
before. This also ensure that v ptr is always set at end of routine
to prevent undefined behavior.
Adam Dickmeiss [Thu, 8 Oct 2009 10:39:34 +0000 (12:39 +0200)]
Two searches with filter args
Adam Dickmeiss [Thu, 8 Oct 2009 10:38:09 +0000 (12:38 +0200)]
Simplify again
Adam Dickmeiss [Thu, 8 Oct 2009 10:35:20 +0000 (12:35 +0200)]
Update test for other filter parsing
Adam Dickmeiss [Thu, 8 Oct 2009 10:33:06 +0000 (12:33 +0200)]
parse_filter: spelling and more readable
Adam Dickmeiss [Thu, 8 Oct 2009 10:28:54 +0000 (12:28 +0200)]
Fix filters parsing
Fix the filter parsing so that equal name=value is working again.
In parse_filter, the eq would be set to NULL after finding '='.
Adam Dickmeiss [Thu, 8 Oct 2009 07:57:42 +0000 (09:57 +0200)]
Update for relevence element in results
Sebastian Hammer [Wed, 7 Oct 2009 14:55:59 +0000 (16:55 +0200)]
Added check for no transform steps
Sebastian Hammer [Wed, 7 Oct 2009 14:08:01 +0000 (14:08 +0000)]
Merge branch 'master' of ssh://git/home/git/pub/pazpar2
Sebastian Hammer [Wed, 7 Oct 2009 14:07:49 +0000 (14:07 +0000)]
Added relevance to return rec
Adam Dickmeiss [Wed, 7 Oct 2009 13:37:20 +0000 (15:37 +0200)]
Share similar XSLTs within session.
XSLTs + MARC maps are cached within a session so we don't re-parse
them over and over again. Even for a session with a single search
there's much to be gained because many targets use the same
transformation.
Adam Dickmeiss [Wed, 7 Oct 2009 12:56:39 +0000 (14:56 +0200)]
record_to_xml, normalize_record static
Adam Dickmeiss [Wed, 7 Oct 2009 12:35:41 +0000 (14:35 +0200)]
Other behavior misconfigured targets bug #2242
Pazpar2 will no longer return errors for individual targets .. such
as unknown stylesheets.. It will still be reported in the Pazpar2 log.
If all targets cannot be configured, it will return 'No targets'.
Adam Dickmeiss [Wed, 7 Oct 2009 12:19:14 +0000 (14:19 +0200)]
Factor out record normalization
Adam Dickmeiss [Wed, 7 Oct 2009 10:27:10 +0000 (12:27 +0200)]
Mergekey changes - order + required/optional.
The metadata attribute 'mergekey' now takes one of three values 'no',
'required', 'optional' . And the resulting mergekey from metadata
is now ordered in the same way as metadata in the service definition.
Older Pazpar2 version use the order in which metadata appeared in a
record instance.
Adam Dickmeiss [Wed, 7 Oct 2009 08:50:09 +0000 (10:50 +0200)]
Revert -V desc to be correct
Adam Dickmeiss [Wed, 7 Oct 2009 08:49:14 +0000 (10:49 +0200)]
Extra parantheses to make GCC happy
Adam Dickmeiss [Wed, 7 Oct 2009 08:39:00 +0000 (10:39 +0200)]
Show option -v in usage
Adam Dickmeiss [Wed, 7 Oct 2009 08:31:08 +0000 (10:31 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Wed, 7 Oct 2009 08:30:11 +0000 (10:30 +0200)]
Log level may be set (option -v)
Jason Skomorowski [Tue, 6 Oct 2009 16:13:44 +0000 (12:13 -0400)]
Substring matching for target selectiion.
Adam Dickmeiss [Mon, 5 Oct 2009 07:49:20 +0000 (09:49 +0200)]
Version 1.2.1
Adam Dickmeiss [Fri, 2 Oct 2009 20:50:02 +0000 (22:50 +0200)]
Move sleep till after kill in test
Adam Dickmeiss [Fri, 2 Oct 2009 20:33:43 +0000 (22:33 +0200)]
Use curl or wget for URL tests
Adam Dickmeiss [Fri, 2 Oct 2009 20:32:20 +0000 (22:32 +0200)]
URL encode [] to make curl happy
Adam Dickmeiss [Thu, 1 Oct 2009 19:58:36 +0000 (21:58 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Thu, 1 Oct 2009 19:51:11 +0000 (21:51 +0200)]
Configure checks for netlibs (-lnsl, -lsocket).
This should allow Pazpar2 to use getaddrinfo on Solaris.
Adam Dickmeiss [Thu, 1 Oct 2009 19:45:52 +0000 (21:45 +0200)]
Do not use gethostbyname in threaded resolver
Only use threaded resolver when getaddrinfo is found by configure.
Adam Dickmeiss [Thu, 1 Oct 2009 07:25:40 +0000 (09:25 +0200)]
Update NEWS WRT XML header
Adam Dickmeiss [Tue, 29 Sep 2009 21:20:25 +0000 (23:20 +0200)]
Update test due to XML header output.
Jason Skomorowski [Tue, 29 Sep 2009 19:49:56 +0000 (15:49 -0400)]
XML declaration added to command output.
Bug #3051
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