X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=5f127eabb98f4f5db92cd343f1a0cdb592a0e2c8;hb=a50d5d492e9b63cec3f82a610f2bf0e1e470f9ae;hp=d2c9b7042bd3760d0c1860951d78c4168898b2e9;hpb=9e8d657340483f6af7169828917da385f8e6ee9f;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index d2c9b70..5f127ea 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,5 +1,5 @@ /* 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 @@ -390,7 +390,6 @@ void connect_resolver_host(struct host *host, iochan_man_t iochan_man) } else { - yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state); con = con->next; } } @@ -415,6 +414,7 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) struct session_database *sdb = client_get_database(con->client); const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG); + const char *memcached = session_setting_oneval(sdb, PZ_MEMCACHED); assert(con); @@ -424,6 +424,8 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) if ((charset = session_setting_oneval(sdb, PZ_NEGOTIATION_CHARSET))) ZOOM_options_set(zoptions, "charset", charset); + if (memcached && *memcached) + ZOOM_options_set(zoptions, "memcached", memcached); assert(host->ipport); if (host->proxy) @@ -452,7 +454,7 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) { /* allow splitting user and reset with a blank always */ const char *cp1 = strchr(auth, ' '); - if (!cp1 && sru && *sru_version) + if (!cp1 && sru && *sru) cp1 = strchr(auth, '/'); if (!cp1) {