Adam Dickmeiss [Thu, 10 Dec 2009 11:37:17 +0000 (12:37 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Thu, 10 Dec 2009 11:36:36 +0000 (12:36 +0100)]
Describe pz:xslt and the auto setting
Adam Dickmeiss [Thu, 10 Dec 2009 11:32:36 +0000 (12:32 +0100)]
Fix RPN to CQL mappings, i.e use string attributes
Jakub Skoczen [Thu, 10 Dec 2009 10:19:42 +0000 (11:19 +0100)]
Add citation element
Jakub Skoczen [Thu, 10 Dec 2009 10:15:38 +0000 (11:15 +0100)]
Remove mergekey declaration
Jakub Skoczen [Thu, 10 Dec 2009 10:11:57 +0000 (11:11 +0100)]
Move mergekey definition to pazpar2.cfg
Moves mergekey definition away from the normalization stylesheets and
defines a mergekey common for all target types in pazpar2.cfg.
Adam Dickmeiss [Tue, 1 Dec 2009 21:24:02 +0000 (22:24 +0100)]
Use Odr_int type for hit counts
Use the Odr_int type for hit counts. This is part of YAZ 3.0.47
and later and so configure checks for that.
Adam Dickmeiss [Tue, 24 Nov 2009 19:29:38 +0000 (20:29 +0100)]
Update test_normalize for skiparticle fix
Adam Dickmeiss [Tue, 24 Nov 2009 11:45:13 +0000 (12:45 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Tue, 24 Nov 2009 11:34:30 +0000 (12:34 +0100)]
Win32 makefile: dist depends nsi
Adam Dickmeiss [Tue, 24 Nov 2009 11:23:35 +0000 (12:23 +0100)]
Bump version, update NEWS
Adam Dickmeiss [Tue, 24 Nov 2009 11:19:35 +0000 (12:19 +0100)]
Metadata 'skiparticle works for ICU normalization
The skiparticle handling was only working for the 7-bit ASCII
normalization code before.
Mike Taylor [Thu, 19 Nov 2009 16:33:09 +0000 (16:33 +0000)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Mike Taylor [Thu, 19 Nov 2009 16:33:03 +0000 (16:33 +0000)]
Added error-reporting for the case where a HTTP response is 200 OK but
it does not contain any XML (for example because it is a
human-readable HTML page explaining what went wrong).
Removed obsolete CVS Id.
Adam Dickmeiss [Thu, 12 Nov 2009 19:48:49 +0000 (20:48 +0100)]
Update test result WRT marcmap
marcmap no longer produces a mergekey so a unique mergekey is
generated instead in test.
Jason Skomorowski [Wed, 11 Nov 2009 13:02:36 +0000 (08:02 -0500)]
explicitly state encoding as utf-8
that probably took long than it was worth, but we want the output the same as xsl!
Jason Skomorowski [Tue, 10 Nov 2009 15:00:56 +0000 (10:00 -0500)]
put root element in pz namespace in marcmap output
Jason Skomorowski [Thu, 5 Nov 2009 16:20:10 +0000 (11:20 -0500)]
I $ed where I should have *ed.
Jason Skomorowski [Thu, 5 Nov 2009 15:57:13 +0000 (10:57 -0500)]
MARC XML also includes MARC generally
Adam Dickmeiss [Wed, 4 Nov 2009 12:01:29 +0000 (13:01 +0100)]
Avoid useless temp
Adam Dickmeiss [Wed, 4 Nov 2009 12:00:34 +0000 (13:00 +0100)]
Testing: align test no and line no (_urls)
Adam Dickmeiss [Wed, 4 Nov 2009 11:56:39 +0000 (12:56 +0100)]
Testing: use standard IFS for test URLs
Use standard IFS instead of new-line for testing. This allow us
to have multiple items on one line, thus ensuring that line #x is
test_#x in test result.
Adam Dickmeiss [Wed, 4 Nov 2009 11:48:12 +0000 (12:48 +0100)]
Deal with empty fields for ranking
Avoid division by length=0 in relevance_countwords.
Adam Dickmeiss [Tue, 3 Nov 2009 14:08:44 +0000 (15:08 +0100)]
Update test results for new ranking
Adam Dickmeiss [Tue, 3 Nov 2009 14:03:41 +0000 (15:03 +0100)]
Modify length calculation for ranking
Use a different denominator (length) for per-field relevance
scoring.. Instead of length of all ranked fields we now use
length of individual fields (as if they were individual "free" text
fields). This will ensure that documents with a long field with no
match (say description) will not "hurt" a title match.
Adam Dickmeiss [Tue, 3 Nov 2009 12:15:27 +0000 (13:15 +0100)]
Remove dead code for relevancy (trie stuff)
Adam Dickmeiss [Fri, 30 Oct 2009 21:45:28 +0000 (22:45 +0100)]
Fix bytarget requests being stopped (bug #3087)
Context global activeClients is set to 1 when a search is initiated
to ensure that if bytarget is executed it will be continued if
no response has been returned which would set activeClients (show,
stat).
Adam Dickmeiss [Tue, 27 Oct 2009 08:25:28 +0000 (09:25 +0100)]
Update test result for new mergekey (marcmap)
Jason Skomorowski [Tue, 27 Oct 2009 02:40:49 +0000 (22:40 -0400)]
marcmap mergekey missed author.
Adam Dickmeiss [Mon, 26 Oct 2009 16:00:57 +0000 (17:00 +0100)]
Test return error if curl is not found
Adam Dickmeiss [Mon, 26 Oct 2009 09:20:49 +0000 (10:20 +0100)]
Update test results for diagnostic code
Sebastian Hammer [Fri, 23 Oct 2009 18:40:03 +0000 (18:40 +0000)]
Diagnostic member was not set on connection error. Fixed
Adam Dickmeiss [Tue, 20 Oct 2009 11:54:07 +0000 (13:54 +0200)]
New setting: pz:pqf_strftime
This setting does all what pqf_prefix does but more. It uses strftime
conversions and reserves %% for the original PQF.
Adam Dickmeiss [Tue, 20 Oct 2009 11:05:42 +0000 (13:05 +0200)]
Add test for custom attribute (description@tag)
Adam Dickmeiss [Tue, 20 Oct 2009 10:52:16 +0000 (12:52 +0200)]
Preserve pz:metadata attributes
Pazpar2 now preserves pz:metadata attributes for non-merged
elements. This allows custom attributes to be passed through
to a user interface from records.
Adam Dickmeiss [Tue, 20 Oct 2009 10:32:28 +0000 (12:32 +0200)]
Const value for record_metadata_init
Adam Dickmeiss [Tue, 20 Oct 2009 10:02:57 +0000 (12:02 +0200)]
Fix double xmlFree - occurred for XSLT failure
Adam Dickmeiss [Mon, 19 Oct 2009 14:50:57 +0000 (16:50 +0200)]
Fix Host header for SRU/SRW - bug #3069
Adam Dickmeiss [Fri, 16 Oct 2009 21:57:54 +0000 (23:57 +0200)]
Fix update settings for wildcard zurls
Adam Dickmeiss [Thu, 15 Oct 2009 10:12:44 +0000 (12:12 +0200)]
Refactor database code
Filter handling now in database.c.
Adam Dickmeiss [Thu, 15 Oct 2009 08:37:03 +0000 (10:37 +0200)]
Addd test case for per-session setting
Adam Dickmeiss [Thu, 15 Oct 2009 07:59:05 +0000 (09:59 +0200)]
Sessions may be added per-session.
Settings system refactoring which allows settings to be defined
per-session (session_database and database).
Adam Dickmeiss [Thu, 15 Oct 2009 07:58:07 +0000 (09:58 +0200)]
Use PAZPAR2_USE_VALGRIND for test
If PAZPAR2_USE_VALGRIND=true, valgrind will be used for a test, eg
PAZPAR2_USE_VALGRIND=true ./test_http.sh .
Adam Dickmeiss [Wed, 14 Oct 2009 14:32:24 +0000 (16:32 +0200)]
Test case for setting overrides
Adam Dickmeiss [Wed, 14 Oct 2009 14:29:36 +0000 (16:29 +0200)]
Settings, bytarget + db out-of-range check
Command bytarget with argument settings=1 will show settings
per target.. This is to be able to verify correct settings and
be able to test that they are correct. The database settings
array size is now also stored.. Problems with database settings
array is that if not carefull it will be too small (smaller
than dictionary per-service in settings).
Adam Dickmeiss [Wed, 14 Oct 2009 14:27:48 +0000 (16:27 +0200)]
Fix nasty bug of overrides not working
Adam Dickmeiss [Tue, 13 Oct 2009 13:55:46 +0000 (15:55 +0200)]
Deal with relevance values round-off case
Adam Dickmeiss [Tue, 13 Oct 2009 13:54:11 +0000 (15:54 +0200)]
Sometimes it takes 2 sec for Pazpar2 to stop
Adam Dickmeiss [Tue, 13 Oct 2009 11:48:58 +0000 (13:48 +0200)]
Make reclist sorting stable
Make reclist sorting stable by comparing mergekey for records if
relevance/title or other sorting criteria all match. This is merely
to ensure that our regressions tests works (reproducible output).
Adam Dickmeiss [Tue, 13 Oct 2009 11:28:50 +0000 (13:28 +0200)]
Dont include start,number for show tests
Adam Dickmeiss [Tue, 13 Oct 2009 11:13:05 +0000 (13:13 +0200)]
Reformat
Adam Dickmeiss [Tue, 13 Oct 2009 11:03:52 +0000 (13:03 +0200)]
Fix type of mergekey
Adam Dickmeiss [Tue, 13 Oct 2009 11:03:34 +0000 (13:03 +0200)]
Update to host website
Adam Dickmeiss [Tue, 13 Oct 2009 09:24:14 +0000 (11:24 +0200)]
Version 1.2.2
Adam Dickmeiss [Tue, 13 Oct 2009 09:21:26 +0000 (11:21 +0200)]
Describe filter,maxrecs,startrecs
Adam Dickmeiss [Tue, 13 Oct 2009 09:20:39 +0000 (11:20 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Tue, 13 Oct 2009 09:19:15 +0000 (11:19 +0200)]
Operator for pz:recordfilter is ~ (tilde).
The operator used to be = (equals), but since pz:recordfilter only
does substring match it seems more natural to harmonize with the
filter semantics (which has ~ for substring, = for string match).
Adam Dickmeiss [Tue, 13 Oct 2009 09:18:36 +0000 (11:18 +0200)]
Describe pz:recordfilter
Adam Dickmeiss [Tue, 13 Oct 2009 09:14:13 +0000 (11:14 +0200)]
Reformat
Adam Dickmeiss [Mon, 12 Oct 2009 20:32:52 +0000 (22:32 +0200)]
Set ZOOM option start always for 0-case.
For maxrecs=0 or maxrecs omitted, set ZOOM option "start".
Adam Dickmeiss [Mon, 12 Oct 2009 14:21:35 +0000 (16:21 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Mon, 12 Oct 2009 14:21:19 +0000 (16:21 +0200)]
New optional argument, startrecs, for cmd=search
Adam Dickmeiss [Mon, 12 Oct 2009 14:15:15 +0000 (16:15 +0200)]
Enable apdulog for test server
Heikki Levanto [Mon, 12 Oct 2009 11:59:09 +0000 (13:59 +0200)]
Added two new fields
856$i gets into electronic-format-instruction
856$q gets into electronic-fortmat-type
Needed for LOT
Adam Dickmeiss [Mon, 12 Oct 2009 10:22:40 +0000 (12:22 +0200)]
New optional argument, maxrecs, for cmd=search
Adam Dickmeiss [Mon, 12 Oct 2009 08:29:56 +0000 (10:29 +0200)]
Make Pazpar2 work on Libxml2 2.4
Adam Dickmeiss [Sat, 10 Oct 2009 20:18:27 +0000 (22:18 +0200)]
Use curl for tests. No wget.
Search for curl in PATH and run test if present. wget is no longer used -
because it does not return "empty" result if HTTP server returns error
(e.g 417) - and because wget on older systems don't work with Pazpar2
at all.
Adam Dickmeiss [Fri, 9 Oct 2009 18:13:11 +0000 (20:13 +0200)]
Add test for pz:maxrecs
Adam Dickmeiss [Fri, 9 Oct 2009 18:11:50 +0000 (20:11 +0200)]
Adjust presentChunk for low value of pz:maxrecs
Set presentChunk to pz:maxrecs if that is lower than 20 (default value
of presentChunk).
Adam Dickmeiss [Fri, 9 Oct 2009 14:41:45 +0000 (16:41 +0200)]
Merge branch 'reclist_max_recs'
Adam Dickmeiss [Fri, 9 Oct 2009 14:26:54 +0000 (16:26 +0200)]
Fix dump_records for cluster==0
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 [Fri, 9 Oct 2009 12:32:47 +0000 (14:32 +0200)]
Update sample cclmap for SRU test server
The cclmap settings now use the string use-attribute which is the
name of the CCL search field. This config uses cql_transform_rpn2cql
without the need for pqf.properties. See also bug #2978.
Adam Dickmeiss [Fri, 9 Oct 2009 12:31:58 +0000 (14:31 +0200)]
Log more for PQF to CQL conversion
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