Dennis Schafroth [Wed, 28 Apr 2010 16:14:06 +0000 (18:14 +0200)]
Fixed: missing release_session. Using HTTP module log level some places.
Sebastian Hammer [Wed, 28 Apr 2010 14:09:03 +0000 (14:09 +0000)]
Merge branch 'master' of ssh://git/home/git/pub/pazpar2
Sebastian Hammer [Wed, 28 Apr 2010 14:08:31 +0000 (14:08 +0000)]
Fixed capitalization of Pazpar2.
Dennis Schafroth [Wed, 28 Apr 2010 14:07:38 +0000 (16:07 +0200)]
Merge branch 'channel_list_mutex' of ssh://git.indexdata.com/home/git/pub/pazpar2 into channel_list_mutex
Dennis Schafroth [Wed, 28 Apr 2010 14:07:30 +0000 (16:07 +0200)]
Removed unlocking/lock of clients as in master.
Dennis Schafroth [Wed, 28 Apr 2010 14:06:35 +0000 (16:06 +0200)]
Fixed warnings: wrong return parameter. C90 compliant.
Dennis Schafroth [Wed, 28 Apr 2010 14:03:33 +0000 (16:03 +0200)]
Fixed: mutex protect session nmem malloc in show_range_start. Cosmetic: renamed session *s to session *se.
Adam Dickmeiss [Wed, 28 Apr 2010 13:03:40 +0000 (15:03 +0200)]
Build require YAZ 4.0.4
Adam Dickmeiss [Wed, 28 Apr 2010 12:59:34 +0000 (14:59 +0200)]
Require YAZ 4.0.4. No need for libyaz_server.
Adam Dickmeiss [Wed, 28 Apr 2010 12:58:58 +0000 (14:58 +0200)]
Update for changed 3arg for yaz_cond_wait
Dennis Schafroth [Wed, 28 Apr 2010 12:25:23 +0000 (14:25 +0200)]
Lowered number to 10 clients
Dennis Schafroth [Wed, 28 Apr 2010 12:24:41 +0000 (14:24 +0200)]
Added .time files and run* directories to ignore.
Dennis Schafroth [Wed, 28 Apr 2010 12:07:40 +0000 (14:07 +0200)]
Implemented the destroy_counter on HTTP commands. Only destroy HTTP session if no http command is active.
Adam Dickmeiss [Wed, 28 Apr 2010 08:34:21 +0000 (10:34 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Wed, 28 Apr 2010 08:32:49 +0000 (10:32 +0200)]
ingest_record: lock client, then session
lock client, then session rather than the reverse way. This
saves us locking but more importantly prevents that session
gets destroyed under our feet (while client and session is
not locked).
Wolfram Schneider [Tue, 27 Apr 2010 15:21:08 +0000 (15:21 +0000)]
set charset to utf-8
Sebastian Hammer [Tue, 27 Apr 2010 15:06:16 +0000 (11:06 -0400)]
Fixed colors
Dennis Schafroth [Tue, 27 Apr 2010 14:19:11 +0000 (16:19 +0200)]
Indented.
Fixed: Keeping the start of the channel list as invariant through the event loop, so we dont look at newly added IOCHANnels. This could be the cause of the messed-up http show call.
Started on the refactoring of moving to yaz_poll, but holding back to see if this fix works.
Adam Dickmeiss [Tue, 27 Apr 2010 12:50:44 +0000 (14:50 +0200)]
New setting setting: pz:max_connections
Setting pz:max_connections is a limit of number of sockets to a host.
When this limit is reached, Pazpar2 will wait up to 5 seconds for a
connection to becomes available. The client will be marked Client_Error
when it can not be searched (other clients in a session may work).
If pz:max_connections is not set for a target, a value of 30 will be
used.
Dennis Schafroth [Tue, 27 Apr 2010 11:49:03 +0000 (13:49 +0200)]
Added PP2 session create/destroy logging
Dennis Schafroth [Tue, 27 Apr 2010 11:47:59 +0000 (13:47 +0200)]
Added work queue length logging
Dennis Schafroth [Tue, 27 Apr 2010 11:47:10 +0000 (13:47 +0200)]
Added more HTTP session logging
Dennis Schafroth [Tue, 27 Apr 2010 09:01:49 +0000 (11:01 +0200)]
Merge branch 'master' into channel_list_mutex
Dennis Schafroth [Tue, 27 Apr 2010 09:00:09 +0000 (11:00 +0200)]
Use tmarc.xsl
Dennis Schafroth [Tue, 27 Apr 2010 08:58:54 +0000 (10:58 +0200)]
Added iochan_man iterator: Protects the initial node in threaded code.
Adam Dickmeiss [Tue, 27 Apr 2010 08:46:22 +0000 (10:46 +0200)]
Remove maskfun/socketfun
Adam Dickmeiss [Mon, 26 Apr 2010 11:11:30 +0000 (13:11 +0200)]
Add facility to track total connections in use
Adam Dickmeiss [Mon, 26 Apr 2010 10:23:36 +0000 (12:23 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Wolfram Schneider [Mon, 26 Apr 2010 09:33:58 +0000 (09:33 +0000)]
update ID logo
Wolfram Schneider [Mon, 26 Apr 2010 09:31:26 +0000 (09:31 +0000)]
Index Data green, Bug 3403
Adam Dickmeiss [Mon, 26 Apr 2010 09:08:32 +0000 (11:08 +0200)]
Update test for raw show to usmarc rather than xml
Wolfram Schneider [Sat, 24 Apr 2010 10:12:04 +0000 (12:12 +0200)]
remove stale $Id$ tag
Wolfram Schneider [Sat, 24 Apr 2010 10:10:10 +0000 (12:10 +0200)]
upgrade copyright to 2010, bug #3404
Sebastian Hammer [Sat, 24 Apr 2010 04:11:19 +0000 (04:11 +0000)]
Fixed speling of Index Data
Adam Dickmeiss [Fri, 23 Apr 2010 13:33:31 +0000 (15:33 +0200)]
Read co->client only when co is locked
Adam Dickmeiss [Fri, 23 Apr 2010 11:54:21 +0000 (13:54 +0200)]
Avoid client_set_state on destroyed client
Call client_set_state before connection_destroy because
connection_destroy might remove client (reference count 0).
Adam Dickmeiss [Fri, 23 Apr 2010 11:34:42 +0000 (13:34 +0200)]
conf_get_fname takes conf_config as arg
conf_get_fname takes conf_config rather than conf_service as argument.
This function is used by the normalize_record system.
Adam Dickmeiss [Fri, 23 Apr 2010 11:33:58 +0000 (13:33 +0200)]
Call relevance_destroy before nmem_reset
This to a void that relevance_destroy refers to NMEM released
memory.
Adam Dickmeiss [Fri, 23 Apr 2010 11:21:42 +0000 (13:21 +0200)]
Declare conf_service
Adam Dickmeiss [Thu, 22 Apr 2010 11:45:53 +0000 (13:45 +0200)]
Remove pazpar2_sleep (for client lock test)
Adam Dickmeiss [Thu, 22 Apr 2010 08:54:44 +0000 (10:54 +0200)]
Rename connection local to co (from new)
Adam Dickmeiss [Thu, 22 Apr 2010 08:52:00 +0000 (10:52 +0200)]
Remove two unused struct decls
Adam Dickmeiss [Thu, 22 Apr 2010 08:49:03 +0000 (10:49 +0200)]
include of yaz/proto.h not necessary
Adam Dickmeiss [Thu, 22 Apr 2010 08:47:50 +0000 (10:47 +0200)]
connection_release private
Adam Dickmeiss [Thu, 22 Apr 2010 08:46:44 +0000 (10:46 +0200)]
Remove unused function connection_get_url
Adam Dickmeiss [Thu, 22 Apr 2010 08:44:09 +0000 (10:44 +0200)]
http_session_destroy: dont wait for active clients
Because we have introduced client locking, each client owned by
a session will be notified that the session is gone.
Adam Dickmeiss [Thu, 22 Apr 2010 08:42:53 +0000 (10:42 +0200)]
Introduce client_locking
Adam Dickmeiss [Wed, 21 Apr 2010 13:17:33 +0000 (15:17 +0200)]
Rename session mutex to session_mutex
Adam Dickmeiss [Tue, 20 Apr 2010 12:24:28 +0000 (14:24 +0200)]
Client list for session to separate client_list
Adam Dickmeiss [Tue, 20 Apr 2010 11:10:58 +0000 (13:10 +0200)]
No lock on host->mutex for non-timeout events
In connection_handler.
Adam Dickmeiss [Tue, 20 Apr 2010 11:10:22 +0000 (13:10 +0200)]
Remove client_fatal. connection_destroy is static
Adam Dickmeiss [Tue, 20 Apr 2010 10:52:36 +0000 (12:52 +0200)]
Lock connection host->mutex in connection_handler
If a timeout occurs when a client exists and is non-Idle, the timeout
is ignored. This ensures that if a timeout happens after a connection
is picked up in client_prep_connection, then it is not destroyed
(soon after).
In connection_create, move code that adds connection to host list to
the end of the creation phase.
Adam Dickmeiss [Mon, 19 Apr 2010 11:52:03 +0000 (13:52 +0200)]
Call client_destroy when releasing it from session
Adam Dickmeiss [Mon, 19 Apr 2010 11:42:25 +0000 (13:42 +0200)]
client counting (for debugging)
Adam Dickmeiss [Mon, 19 Apr 2010 10:59:31 +0000 (12:59 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Mon, 19 Apr 2010 10:58:33 +0000 (12:58 +0200)]
Log incref/destroy, remove redundant client_incref
Adam Dickmeiss [Mon, 19 Apr 2010 10:56:52 +0000 (12:56 +0200)]
Remove redundant client_incref, client_destroy
Adam Dickmeiss [Thu, 15 Apr 2010 13:06:14 +0000 (15:06 +0200)]
Mangle ZOOM_resultset in client_set_connection
The ZOOM resultset is now reset in client_set_connection rather than
being destroyed in client_destroy.
Adam Dickmeiss [Thu, 15 Apr 2010 13:00:47 +0000 (15:00 +0200)]
Simplify session_remove_clients
Adam Dickmeiss [Tue, 13 Apr 2010 13:32:36 +0000 (15:32 +0200)]
Add pazpar2_sleep utility
Adam Dickmeiss [Mon, 12 Apr 2010 10:20:29 +0000 (12:20 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Mon, 12 Apr 2010 10:20:01 +0000 (12:20 +0200)]
New configuration file for pbuilder
Jakub Skoczen [Mon, 12 Apr 2010 09:54:49 +0000 (11:54 +0200)]
Merge commit 'origin/json-client'
Dennis Schafroth [Mon, 12 Apr 2010 08:38:03 +0000 (10:38 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Dennis Schafroth [Mon, 12 Apr 2010 08:37:16 +0000 (10:37 +0200)]
Renamed from tmarcxml.xsl
Jakub Skoczen [Fri, 9 Apr 2010 13:41:59 +0000 (15:41 +0200)]
SP usage is configurable.
If jsdemo is to be used in the in SP mode, append
'#useproxy' to the URL
SP mode requires no polling and supports JSON response types
Jakub Skoczen [Fri, 9 Apr 2010 12:58:53 +0000 (14:58 +0200)]
Fix polling handling.
Jakub Skoczen [Fri, 9 Apr 2010 12:50:18 +0000 (14:50 +0200)]
Fix Typo.
Adam Dickmeiss [Fri, 9 Apr 2010 11:19:09 +0000 (13:19 +0200)]
Log events on connections with no clients attach
Adam Dickmeiss [Wed, 7 Apr 2010 11:40:00 +0000 (13:40 +0200)]
Use new YAZ function ZOOM_connection_exec_task .
Pazpar2 is using ZOOM_connection_exec_task instead of ZOOM_event_nonblock
to avoid that we loose any events. ZOOM_connection_exec_task will just
ensure that any outstanding tasks are initiated - such as connect,
earch, present etc.
Adam Dickmeiss [Wed, 7 Apr 2010 10:43:03 +0000 (12:43 +0200)]
Function connection_continue don't peek for events
Adam Dickmeiss [Wed, 7 Apr 2010 09:04:56 +0000 (11:04 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Wed, 7 Apr 2010 09:04:37 +0000 (11:04 +0200)]
Entity example
Jakub Skoczen [Fri, 2 Apr 2010 15:14:54 +0000 (17:14 +0200)]
JSON support for show in pz2.js
Jakub Skoczen [Fri, 2 Apr 2010 08:36:54 +0000 (10:36 +0200)]
Use #text for text nodes content
Adam Dickmeiss [Tue, 30 Mar 2010 07:32:41 +0000 (09:32 +0200)]
Remove iochan_setevent logic. Not in use anymore
Adam Dickmeiss [Tue, 30 Mar 2010 07:28:30 +0000 (09:28 +0200)]
Remove Unused iochan macros
Adam Dickmeiss [Tue, 30 Mar 2010 07:27:56 +0000 (09:27 +0200)]
Refactor http_io to not use iochan_setevent
Adam Dickmeiss [Mon, 29 Mar 2010 13:04:09 +0000 (15:04 +0200)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Mon, 29 Mar 2010 13:01:33 +0000 (15:01 +0200)]
Ensure that connection is only used by one client
While the host and thereby the connection is locked, we mark the
newly assigned client Client_Working. This is to prevent that one
connection gets used by two clients.
Mike Taylor [Fri, 26 Mar 2010 17:09:57 +0000 (17:09 +0000)]
Merge in changes that were made for CMC.
* The "date" input field is now mapped to both "date" and
"publication_date". Previously it was only "publication_date",
which is different from what all pazpar2's other .xsl files produce,
with the result that a UI that uses "md-date" would not see dates
from CF targets. Adding "date" output as well fixed bug #3218 for
CMC, and will also fix the (presumably as-yet unnoticed)
date-display bugs in other Masterkey applications that use CF
targets. It did not remove the "publication_date" output in case we
have other Masterkey UIs that expect to see this date.
* Add support for the CF's "location" and "callno" fields.
Adam Dickmeiss [Thu, 25 Mar 2010 13:47:50 +0000 (14:47 +0100)]
Log number of event channels
This is done after select returns in the main event loop.
Adam Dickmeiss [Thu, 25 Mar 2010 13:47:34 +0000 (14:47 +0100)]
Remove record ingest log msg
Adam Dickmeiss [Thu, 25 Mar 2010 13:39:33 +0000 (14:39 +0100)]
Remove two YLOG_DEBUG logs
Sebastian Hammer [Thu, 25 Mar 2010 00:52:15 +0000 (01:52 +0100)]
Changes to 'item' data by NE and quinn
Sebastian Hammer [Wed, 24 Mar 2010 15:36:22 +0000 (15:36 +0000)]
Changed output AGAIN
Sebastian Hammer [Wed, 24 Mar 2010 15:35:12 +0000 (15:35 +0000)]
Merge branch 'master' of ssh://git/home/git/pub/pazpar2
Sebastian Hammer [Wed, 24 Mar 2010 15:34:44 +0000 (15:34 +0000)]
Chaged element names on output
Adam Dickmeiss [Tue, 23 Mar 2010 14:33:47 +0000 (15:33 +0100)]
par.sh may source a configuration for it
Eg. ./par.sh par.config.adam
Adam Dickmeiss [Tue, 23 Mar 2010 14:33:43 +0000 (15:33 +0100)]
Simplify http_server_destroy
Adam Dickmeiss [Tue, 23 Mar 2010 11:33:40 +0000 (12:33 +0100)]
Reformat
Adam Dickmeiss [Tue, 23 Mar 2010 11:31:20 +0000 (12:31 +0100)]
Debugging level "mutex" enables log mutexes
Sebastian Hammer [Mon, 22 Mar 2010 20:36:22 +0000 (20:36 +0000)]
Added filler for empty circ values, to enable offset-based association between
elements of repeating circ nodes
Sebastian Hammer [Mon, 22 Mar 2010 20:23:04 +0000 (20:23 +0000)]
Added check for null values for availability elements
Adam Dickmeiss [Mon, 22 Mar 2010 19:00:31 +0000 (20:00 +0100)]
Only use yaz_icu_iter_t if ICU is enabled for YAZ
Adam Dickmeiss [Mon, 22 Mar 2010 15:09:26 +0000 (16:09 +0100)]
YAZ log level "iochan" for event handling logs
Adam Dickmeiss [Mon, 22 Mar 2010 15:09:01 +0000 (16:09 +0100)]
Fix print of record diagnostic
Adam Dickmeiss [Mon, 22 Mar 2010 12:52:35 +0000 (13:52 +0100)]
client.sh: using service perf; not perf_t.
Adam Dickmeiss [Mon, 22 Mar 2010 12:26:28 +0000 (13:26 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
Adam Dickmeiss [Mon, 22 Mar 2010 10:24:53 +0000 (11:24 +0100)]
Use marc21_test.xsl rather than marc21.xsl