X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=f318378c67dd6878fb239c4a01ca541755562b30;hb=8979547d2f3be2c18f640f3569bd14e778d54de1;hp=7496a1cea73feb31fb700e46d27559b8f3059654;hpb=a814293e9287584c9f16e772dc3710a590091bd9;p=pazpar2-moved-to-github.git

diff --git a/src/connection.c b/src/connection.c
index 7496a1c..f318378 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,5 +1,5 @@
 /* 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
@@ -183,12 +183,14 @@ static void non_block_events(struct connection *co)
         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;
@@ -344,6 +346,7 @@ static int connection_connect(struct connection *con)
     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;
 
@@ -357,6 +360,10 @@ static int connection_connect(struct connection *con)
     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);