/* This file is part of Pazpar2.
- Copyright (C) 2006-2013 Index Data
+ Copyright (C) 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
if (sdb)
{
yaz_mutex_leave(host->mutex);
- connection_connect(con, iochan_man);
client_start_search(con->client);
}
else
}
else
{
- yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state);
con = con->next;
}
}
const char *charset;
const char *sru;
const char *sru_version = 0;
+ const char *value;
+ WRBUF w;
struct session_database *sdb = client_get_database(con->client);
const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
if (apdulog && *apdulog)
ZOOM_options_set(zoptions, "apdulog", apdulog);
- if ((auth = session_setting_oneval(sdb, PZ_AUTHENTICATION)))
- ZOOM_options_set(zoptions, "user", auth);
+
if ((sru = session_setting_oneval(sdb, PZ_SRU)) && *sru)
ZOOM_options_set(zoptions, "sru", sru);
if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
&& *sru_version)
ZOOM_options_set(zoptions, "sru_version", sru_version);
+
+ if ((auth = session_setting_oneval(sdb, PZ_AUTHENTICATION)))
+ {
+ /* allow splitting user and reset with a blank always */
+ const char *cp1 = strchr(auth, ' ');
+ if (!cp1 && sru && *sru)
+ cp1 = strchr(auth, '/');
+ if (!cp1)
+ {
+ /* Z39.50 user/password style, or no password for SRU */
+ ZOOM_options_set(zoptions, "user", auth);
+ }
+ else
+ {
+ /* now consider group as well */
+ const char *cp2 = strchr(cp1 + 1, ' ');
+
+ ZOOM_options_setl(zoptions, "user", auth, cp1 - auth);
+ if (!cp2)
+ ZOOM_options_set(zoptions, "password", cp1 + 1);
+ else
+ {
+ ZOOM_options_setl(zoptions, "group", cp1 + 1, cp2 - cp1 - 1);
+ ZOOM_options_set(zoptions, "password", cp2 + 1);
+ }
+ }
+ }
+
+ value = session_setting_oneval(sdb, PZ_AUTHENTICATION_MODE);
+ if (value && *value)
+ ZOOM_options_set(zoptions, "authenticationMode", value);
+
if (!(con->link = ZOOM_connection_create(zoptions)))
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection");
return -1;
}
+ w = wrbuf_alloc();
if (sru && *sru && !strstr(con->url, "://"))
- {
- WRBUF w = wrbuf_alloc();
wrbuf_puts(w, "http://");
- wrbuf_puts(w, con->url);
- ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0);
- wrbuf_destroy(w);
- }
- else if (strchr(con->url, '#'))
+ if (strchr(con->url, '#'))
{
const char *cp = strchr(con->url, '#');
- WRBUF w = wrbuf_alloc();
wrbuf_write(w, con->url, cp - con->url);
- ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0);
- wrbuf_destroy(w);
}
else
- {
- ZOOM_connection_connect(con->link, con->url, 0);
- }
+ wrbuf_puts(w, con->url);
+
+ ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0);
+
con->iochan = iochan_create(-1, connection_handler, 0, "connection_socket");
con->state = Conn_Connecting;
iochan_settimeout(con->iochan, con->operation_timeout);
client_set_state(con->client, Client_Connecting);
ZOOM_options_destroy(zoptions);
+ wrbuf_destroy(w);
return 0;
}