Adam Dickmeiss [Fri, 29 Jul 2011 14:19:07 +0000 (16:19 +0200)]
zoom: add facililty to dump APDUs.
Triggered by <log apdu="true"/> in the zoom filter configuation.
Adam Dickmeiss [Fri, 29 Jul 2011 14:02:25 +0000 (16:02 +0200)]
zoom fix: convert backend SRU diagnostics.
The zoom filter speaks Z39.50 and thus SRU diagnostics must be converted
to Z39.50 diagnostics.
Adam Dickmeiss [Thu, 28 Jul 2011 12:54:59 +0000 (14:54 +0200)]
Version 1.3.1
Adam Dickmeiss [Thu, 28 Jul 2011 12:50:37 +0000 (14:50 +0200)]
Define wrbuf_vp_puts for YAZ < 4.2.6
This function is declared for YAZ 4.2.6 and later.
Adam Dickmeiss [Thu, 28 Jul 2011 11:56:54 +0000 (13:56 +0200)]
zoom: improve diagnostics WRT record conversions
Adam Dickmeiss [Thu, 28 Jul 2011 09:20:30 +0000 (11:20 +0200)]
zoom: relay database param 'user' if 'password' is unset
For non-Z39.50 resources also split authentication (user/password) into
user + password options for ZOOM.
Adam Dickmeiss [Wed, 27 Jul 2011 14:56:17 +0000 (16:56 +0200)]
zoom: allow cproxysession as database arg.
Adam Dickmeiss [Wed, 27 Jul 2011 14:20:45 +0000 (16:20 +0200)]
First go at sort.
For SRU targets the CQL sortby is used against target. For Z39.50
it is converted to Zebra's type-7 embedded sorting. Leaves two
areas: built in sorting - by the zoom module; and Z39.50 standard
sorting. Note that CF should eventually honor type-7 embedded
sorting.
Adam Dickmeiss [Wed, 27 Jul 2011 09:35:58 +0000 (11:35 +0200)]
Version 1.3.0
Adam Dickmeiss [Tue, 26 Jul 2011 14:39:47 +0000 (16:39 +0200)]
zoom: put contentConnector in temp file
Adam Dickmeiss [Tue, 26 Jul 2011 14:22:42 +0000 (16:22 +0200)]
Refactor database URL logic
And reduce by 20 lines or so.
Adam Dickmeiss [Tue, 26 Jul 2011 13:51:03 +0000 (15:51 +0200)]
zoom: generating content proxy parameters in file
Adam Dickmeiss [Tue, 26 Jul 2011 13:05:21 +0000 (15:05 +0200)]
zoom: create temp for contentProxy
The temporary file name is configable by tmp_file attribute of element
contentProxy of the zoom filter.
Adam Dickmeiss [Tue, 26 Jul 2011 11:41:38 +0000 (13:41 +0200)]
mp_xml::check_empty displays filter type on error
Adam Dickmeiss [Mon, 25 Jul 2011 14:44:02 +0000 (16:44 +0200)]
Merge branch 'master' into content_proxy
Adam Dickmeiss [Mon, 25 Jul 2011 14:40:35 +0000 (16:40 +0200)]
Start work on contentProxy support
New setting in Torus/record contentConnector specifies a connector
to be used for contentProxy. If this is defined (non-zero length)
then content proxy rewrite is performed on generated-url from urlRecipe.
The rewritten server is specified by attribute 'server' in element
contentProxy in zoom filter configureation.
Adam Dickmeiss [Mon, 25 Jul 2011 14:10:42 +0000 (14:10 +0000)]
Version 1.2.10
Adam Dickmeiss [Mon, 25 Jul 2011 12:46:11 +0000 (14:46 +0200)]
Fixes for Win makefile. Update to Boost 1.43
Unfortunately, Boost 1.46 and Boost 1.47 have linking problems.
Some .lib refers to libboost_thread*.lib while only boost_thread*lib
is available. Version 1.43 do not have this problem (.lib files still
have prefix "lib").
Adam Dickmeiss [Mon, 25 Jul 2011 11:05:42 +0000 (13:05 +0200)]
zoom: use yaz_filepath_resolve for XSLT files.
Might as well use this function when it is also used for filter
record_transform. Change the error handling a bit, for example
do not even attempt to XML parse a non-existing file.
Adam Dickmeiss [Mon, 25 Jul 2011 11:04:27 +0000 (13:04 +0200)]
metaproxy program: set file path to "." if empty
This to ensure that yaz_filepath_resolve will find file name
if configuration is in current directory (in which case path ends
up empty).
Adam Dickmeiss [Mon, 25 Jul 2011 09:05:59 +0000 (11:05 +0200)]
Adding '(backend)' to addinfo for backend diagnostics
Solves #4405.
Adam Dickmeiss [Thu, 21 Jul 2011 13:58:11 +0000 (15:58 +0200)]
zoom: using configure path for XSL load
Adam Dickmeiss [Thu, 21 Jul 2011 13:57:19 +0000 (15:57 +0200)]
record_transform: using configure path for XSL load
Adam Dickmeiss [Thu, 21 Jul 2011 12:54:43 +0000 (14:54 +0200)]
Add path to configure method of filter.
This changes the API.
Adam Dickmeiss [Thu, 21 Jul 2011 11:49:13 +0000 (13:49 +0200)]
Bump metaproxy library from 3 to 4
Adam Dickmeiss [Thu, 21 Jul 2011 11:06:22 +0000 (13:06 +0200)]
metaproxy daemon: option -t tests configuration
Adam Dickmeiss [Wed, 20 Jul 2011 12:23:17 +0000 (14:23 +0200)]
jstor test - locally defined
Adam Dickmeiss [Tue, 19 Jul 2011 14:10:39 +0000 (16:10 +0200)]
zoom: for non-CF pass proxy from URI parameters
Always pass subdatabase from Torus (if given).
Pass cfProxy from Torus only if database parameters are given.
Adam Dickmeiss [Tue, 19 Jul 2011 10:35:45 +0000 (12:35 +0200)]
Parse file_include_path to filter parsing
Adam Dickmeiss [Tue, 19 Jul 2011 09:28:15 +0000 (11:28 +0200)]
Make config-zoom a smaller example
Adam Dickmeiss [Mon, 18 Jul 2011 12:22:43 +0000 (14:22 +0200)]
xmlutil test: display standard exception if thrown
Adam Dickmeiss [Mon, 18 Jul 2011 12:21:48 +0000 (14:21 +0200)]
url_recipe: avoid empty regex
On some Boost regex libraries an empty regex throws an exception
Adam Dickmeiss [Thu, 30 Jun 2011 17:34:43 +0000 (19:34 +0200)]
URL recipe in place
Adam Dickmeiss [Thu, 30 Jun 2011 15:40:29 +0000 (17:40 +0200)]
Beginnings of url recipe handling
Adam Dickmeiss [Thu, 30 Jun 2011 14:47:05 +0000 (16:47 +0200)]
Make config-zoom well-formed again
Mike Taylor [Thu, 30 Jun 2011 03:39:48 +0000 (22:39 -0500)]
Reinstate misspelled index names, but mark as deprecated.
Mike Taylor [Thu, 30 Jun 2011 03:38:44 +0000 (22:38 -0500)]
Fix typos in two CQL index names.
Adam Dickmeiss [Wed, 29 Jun 2011 16:14:09 +0000 (18:14 +0200)]
metaproxy man: add productnumber
Adam Dickmeiss [Wed, 29 Jun 2011 14:42:08 +0000 (16:42 +0200)]
Debian control: split long lines
Adam Dickmeiss [Wed, 29 Jun 2011 14:23:19 +0000 (16:23 +0200)]
Debian: build depends on libboost-regex-dev
Adam Dickmeiss [Wed, 29 Jun 2011 14:13:26 +0000 (16:13 +0200)]
configure checks for Boost regex
Adam Dickmeiss [Wed, 29 Jun 2011 14:12:37 +0000 (16:12 +0200)]
Update m4
Adam Dickmeiss [Mon, 27 Jun 2011 22:23:07 +0000 (00:23 +0200)]
metaproxy init.d stop: stop by PID only
In some cases the name of the metaproxy will be lt-metaproxy . This is
if metaproxy is using shared libraries and is not installed. Omitting
name option from start-stop-daemon will make it stop based on the PID
file only.
Adam Dickmeiss [Mon, 27 Jun 2011 20:20:44 +0000 (22:20 +0200)]
Version 1.2.9
Adam Dickmeiss [Mon, 27 Jun 2011 20:20:11 +0000 (22:20 +0200)]
Doc: Fix spell of emphasis tag.
Adam Dickmeiss [Mon, 27 Jun 2011 17:18:56 +0000 (19:18 +0200)]
zoom: enable marc-8 by default for usmarc and opac.
Adam Dickmeiss [Mon, 27 Jun 2011 11:44:19 +0000 (13:44 +0200)]
zoom: assume marc-8 by default for records except XML.
Adam Dickmeiss [Sat, 25 Jun 2011 18:52:37 +0000 (20:52 +0200)]
Factory: modify add_creator method
Adam Dickmeiss [Sat, 25 Jun 2011 18:48:42 +0000 (20:48 +0200)]
Refactor MP main a little and clean up
Adam Dickmeiss [Fri, 24 Jun 2011 11:03:56 +0000 (13:03 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
Adam Dickmeiss [Fri, 24 Jun 2011 11:03:45 +0000 (13:03 +0200)]
zoom config: local fake CF target
Adam Dickmeiss [Fri, 24 Jun 2011 11:02:41 +0000 (13:02 +0200)]
zoom filter schema: Update for CF-stuff.
Adam Dickmeiss [Fri, 24 Jun 2011 10:37:59 +0000 (12:37 +0200)]
zoom: For non-CF targets database arguments are parsed.
User may supply db,user=myuser&password=mypass for non-CF targets.
and these values override what's given the authentication from
the target profile.
Adam Dickmeiss [Fri, 24 Jun 2011 10:37:59 +0000 (12:37 +0200)]
For non-CF targets database arguments are parsed.
User may supply db,user=myuser&password=mypass for non-CF targets.
and these values override what's given the authentication from
the target profile.
Adam Dickmeiss [Fri, 24 Jun 2011 09:57:10 +0000 (11:57 +0200)]
config-zoom: set element_transform to pz2
Adam Dickmeiss [Fri, 24 Jun 2011 09:55:03 +0000 (11:55 +0200)]
session_shared: fix ref to freed memory
Would occur if a search response had non-surrogate diagnostics.
Adam Dickmeiss [Thu, 23 Jun 2011 10:56:22 +0000 (12:56 +0200)]
zoom: configurable element sets for record transforms.
The target profile based transform is specified by element_transform
in element torus of of the ZOOM filter configuration ; default value
is "pz2". Target profile based retrieval is specified by element_raw
in configuration. It will perform same steps, but omit the XSL transform.
Default value is "raw".
Adam Dickmeiss [Wed, 22 Jun 2011 19:07:07 +0000 (19:07 +0000)]
zoom: element set is omitted if not set in profile
But only if pz2 transform is in effect. Previously the default
element set was to "F".
Adam Dickmeiss [Wed, 22 Jun 2011 13:55:23 +0000 (15:55 +0200)]
zoom doc: spell fix
Adam Dickmeiss [Wed, 22 Jun 2011 13:55:13 +0000 (15:55 +0200)]
No tab
Adam Dickmeiss [Wed, 22 Jun 2011 13:31:03 +0000 (15:31 +0200)]
pz22usi.xsl not maintained in MP
Adam Dickmeiss [Wed, 22 Jun 2011 12:57:29 +0000 (14:57 +0200)]
Version 1.2.8
Adam Dickmeiss [Wed, 22 Jun 2011 12:52:25 +0000 (14:52 +0200)]
Route may be given for each port in frontend_net
Adam Dickmeiss [Wed, 22 Jun 2011 11:51:33 +0000 (13:51 +0200)]
Update version to metaproxy.spec
Adam Dickmeiss [Wed, 22 Jun 2011 11:22:50 +0000 (13:22 +0200)]
Version 1.2.7
Adam Dickmeiss [Wed, 22 Jun 2011 11:17:43 +0000 (13:17 +0200)]
zoom: more documentation
Adam Dickmeiss [Wed, 22 Jun 2011 11:17:10 +0000 (13:17 +0200)]
Update generated stylesheets rng, xsd
Adam Dickmeiss [Wed, 22 Jun 2011 10:01:25 +0000 (12:01 +0200)]
zoom: allow local torus record.
One or more Torus records may be specified in local zoom configuration.
The torus element may include a records element which holds zero or
record elements.
Adam Dickmeiss [Tue, 21 Jun 2011 19:33:46 +0000 (21:33 +0200)]
Schema and beginnings of man page for zoom filter
Adam Dickmeiss [Tue, 21 Jun 2011 19:33:01 +0000 (21:33 +0200)]
Remove include of torus.hpp
Adam Dickmeiss [Tue, 21 Jun 2011 13:16:41 +0000 (15:16 +0200)]
Update m4 (for xcinclude)
Adam Dickmeiss [Tue, 21 Jun 2011 12:53:57 +0000 (14:53 +0200)]
Doc: module ref entries include RelagNG schema
In other words.. schema for each module is included in man page for
each module.
Adam Dickmeiss [Tue, 21 Jun 2011 11:27:08 +0000 (13:27 +0200)]
Do not require requestsyntax to be set for pp2 transforms
Some searchables do not have requestsyntax set at least those
where that does not make sense, eg SOLR.
Adam Dickmeiss [Tue, 21 Jun 2011 09:25:01 +0000 (11:25 +0200)]
Split config schemas to separate files
This is to have one schema file per filter.
Adam Dickmeiss [Mon, 20 Jun 2011 09:00:34 +0000 (11:00 +0200)]
configure checks for libxml2/libxslt
Adam Dickmeiss [Mon, 20 Jun 2011 08:48:30 +0000 (10:48 +0200)]
Convert queries to SOLR if enabled - fixes bug 4334.
Adam Dickmeiss [Mon, 20 Jun 2011 08:37:10 +0000 (10:37 +0200)]
configure: depend on yazp 1.2.6
Adam Dickmeiss [Fri, 17 Jun 2011 10:18:47 +0000 (12:18 +0200)]
Allow local ccl maps to be given (as base)
Element cclmap specifies a CCL mapping to a core CCL bibset and is
used as base point for all search sessions. This feature requires
new YAZ utiolity ccl_qual_dup.
Adam Dickmeiss [Fri, 17 Jun 2011 08:24:19 +0000 (10:24 +0200)]
Merge branch 'zoom_filter'
Adam Dickmeiss [Thu, 16 Jun 2011 18:16:31 +0000 (20:16 +0200)]
Remove two yaz_log calls
Adam Dickmeiss [Thu, 16 Jun 2011 18:14:01 +0000 (20:14 +0200)]
Turn ZOOM error into Bib-1 diagnostic 2
And set addinfo for bib-1 to ZOOM error message. Increase
ZOOM timeout to 40 seconds, which is somewhat more than 30!
Adam Dickmeiss [Thu, 16 Jun 2011 13:27:22 +0000 (15:27 +0200)]
other fix for database arguments
Adam Dickmeiss [Thu, 16 Jun 2011 12:48:39 +0000 (14:48 +0200)]
Merge branch 'master' into zoom_filter
Conflicts:
src/filter_zoom.cpp
Adam Dickmeiss [Thu, 16 Jun 2011 12:29:16 +0000 (14:29 +0200)]
zoom: For SRU targets convert to CQL
Still missing is solr targets.
Adam Dickmeiss [Thu, 16 Jun 2011 11:42:34 +0000 (13:42 +0200)]
Don't use Torus database arguments if already given
If database arguments are given for zoom (dbbase,args) , then
the Torus is not used for generating the database args (already
given). This is as a whole, not per-argument.
Adam Dickmeiss [Thu, 16 Jun 2011 11:04:44 +0000 (13:04 +0200)]
Use base db for Torus lookup - up to comma - if given
Adam Dickmeiss [Thu, 16 Jun 2011 10:57:42 +0000 (12:57 +0200)]
zoom config: No CCL field for cql.{anywhere,serverChoice}
Adam Dickmeiss [Thu, 16 Jun 2011 10:56:39 +0000 (12:56 +0200)]
zoom: attribute "ccl" optional for fieldmap
And the semantics is that no CCL field is used . The term qualifier
will be used - if defined.
Adam Dickmeiss [Thu, 16 Jun 2011 10:44:40 +0000 (12:44 +0200)]
zoom: work on predefined ccl maps
Adam Dickmeiss [Thu, 16 Jun 2011 08:02:57 +0000 (10:02 +0200)]
Update m4
Mike Taylor [Wed, 15 Jun 2011 21:52:21 +0000 (22:52 +0100)]
Add <fieldmap>s for the remaining CQL indexes mentioned in section 6.2
of the EBSCO USI specification: rec.identifier, net.path, dc.language,
dc.format, id.fullText, id.peerReviewed, dc.description, dc.source,
dc.publisher and id.seriesTitle.
Adam Dickmeiss [Wed, 15 Jun 2011 19:38:08 +0000 (21:38 +0200)]
virt_db reports init diagnostics when rejected
This fixes bug 4280.
Adam Dickmeiss [Wed, 15 Jun 2011 19:24:02 +0000 (21:24 +0200)]
Implement CQL to CCL fieldmap, bug #4336
So far I have:
<fieldmap cql="cql.anywhere" ccl="term"/>
<fieldmap cql="cql.serverChoice" ccl="term"/>
<fieldmap cql="dc.creator" ccl="au"/>
<fieldmap cql="dc.title" ccl="ti"/>
<fieldmap cql="dc.subject" ccl="su"/>
<fieldmap cql="bash.isbn" ccl="isbn"/>
<fieldmap cql="bash.issn" ccl="issn"/>
<fieldmap cql="dc.date" ccl="date"/>
Adam Dickmeiss [Wed, 15 Jun 2011 12:48:08 +0000 (14:48 +0200)]
Update pz22usi.xsl
Adam Dickmeiss [Wed, 15 Jun 2011 12:33:08 +0000 (14:33 +0200)]
Version 1.2.6
Adam Dickmeiss [Wed, 15 Jun 2011 09:01:29 +0000 (11:01 +0200)]
zoom: tweak CCL to Z39.50 diagnostics.
Adam Dickmeiss [Wed, 15 Jun 2011 08:30:10 +0000 (10:30 +0200)]
Enable session_shared for zoom config
Adam Dickmeiss [Wed, 15 Jun 2011 08:20:13 +0000 (10:20 +0200)]
usi xsl: handle more fields
Adam Dickmeiss [Tue, 14 Jun 2011 20:41:55 +0000 (22:41 +0200)]
Enable SRU for zoom filter config
Adam Dickmeiss [Tue, 14 Jun 2011 20:38:34 +0000 (22:38 +0200)]
elem usi gets converted to pz2