/* This file is part of Pazpar2.
- Copyright (C) 2006-2009 Index Data
+ Copyright (C) 2006-2010 Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Conn_Connecting,
Conn_Open
} state;
- int connect_timeout;
+ int operation_timeout;
int session_timeout;
struct connection *next; // next for same host or next in free list
};
// Creates a new connection for client, associated with the host of
// client's database
static struct connection *connection_create(struct client *cl,
- int connect_timeout,
+ int operation_timeout,
int session_timeout)
{
struct connection *new;
client_set_connection(cl, new);
new->link = 0;
new->state = Conn_Resolving;
- new->connect_timeout = connect_timeout;
+ new->operation_timeout = operation_timeout;
new->session_timeout = session_timeout;
if (host->ipport)
connection_connect(new);
case ZOOM_EVENT_END:
{
const char *error, *addinfo;
- if (ZOOM_connection_error(link, &error, &addinfo))
+ int err;
+ if ((err = ZOOM_connection_error(link, &error, &addinfo)))
{
yaz_log(YLOG_LOG, "Error %s from %s",
error, client_get_url(cl));
}
+ iochan_settimeout(iochan, co->session_timeout);
+ client_set_diagnostic(cl, err);
client_set_state(cl, Client_Idle);
}
break;
break;
case ZOOM_EVENT_SEND_APDU:
client_set_state(co->client, Client_Working);
+ iochan_settimeout(iochan, co->operation_timeout);
break;
case ZOOM_EVENT_RECV_APDU:
break;
case ZOOM_EVENT_CONNECT:
yaz_log(YLOG_LOG, "Connected to %s", client_get_url(cl));
co->state = Conn_Open;
- iochan_settimeout(iochan, co->session_timeout);
break;
case ZOOM_EVENT_RECV_SEARCH:
client_search_response(cl);
struct host *host = connection_get_host(con);
ZOOM_options zoptions = ZOOM_options_create();
const char *auth;
+ const char *charset;
const char *sru;
const char *sru_version = 0;
- char ipport[512] = "";
struct session_database *sdb = client_get_database(con->client);
const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
ZOOM_options_set(zoptions, "async", "1");
ZOOM_options_set(zoptions, "implementationName", PACKAGE_NAME);
ZOOM_options_set(zoptions, "implementationVersion", VERSION);
+
+ if ((charset = session_setting_oneval(sdb, PZ_NEGOTIATION_CHARSET)))
+ ZOOM_options_set(zoptions, "charset", charset);
+
if (zproxy && *zproxy)
{
con->zproxy = xstrdup(zproxy);
}
if (sru && *sru)
- strcpy(ipport, "http://");
- strcat(ipport, host->ipport);
-
- ZOOM_connection_connect(link, ipport, 0);
+ {
+ char http_hostport[512];
+ strcpy(http_hostport, "http://");
+ strcat(http_hostport, host->hostport);
+ ZOOM_connection_connect(link, http_hostport, 0);
+ }
+ else
+ ZOOM_connection_connect(link, host->ipport, 0);
con->link = link;
con->iochan = iochan_create(0, connection_handler, 0);
con->state = Conn_Connecting;
- iochan_settimeout(con->iochan, con->connect_timeout);
+ iochan_settimeout(con->iochan, con->operation_timeout);
iochan_setdata(con->iochan, con);
iochan_setsocketfun(con->iochan, socketfun);
iochan_setmaskfun(con->iochan, maskfun);
// Ensure that client has a connection associated
int client_prep_connection(struct client *cl,
- int connect_timeout, int session_timeout)
+ int operation_timeout, int session_timeout)
{
struct connection *co;
struct session *se = client_get_session(cl);
connection_release(co);
client_set_connection(cl, co);
co->client = cl;
+ co->operation_timeout = operation_timeout;
+ co->session_timeout = session_timeout;
/* tells ZOOM to reconnect if necessary. Disabled becuase
the ZOOM_connection_connect flushes the task queue */
- co->connect_timeout = connect_timeout;
- co->session_timeout = session_timeout;
ZOOM_connection_connect(co->link, 0, 0);
}
else
{
- co = connection_create(cl, connect_timeout, session_timeout);
+ co = connection_create(cl, operation_timeout, session_timeout);
}
}