X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=a115f2b470b029cd092ec699a0a5e870e7b0dc49;hp=71dc720c2086b3c67a20137a6fae8306cfc132f4;hb=5a45e2c9d4e4fb7e3b547df12481b339f50ba8c3;hpb=1a4d6b95fab9bceec919854df8efe8363df55997

diff --git a/client/client.c b/client/client.c
index 71dc720..a115f2b 100644
--- a/client/client.c
+++ b/client/client.c
@@ -702,10 +702,7 @@ static int session_connect_base(const char *arg, const char **basep)
     strncpy(type_and_host, arg, sizeof(type_and_host)-1);
     type_and_host[sizeof(type_and_host)-1] = '\0';
 
-    if (yazProxy)
-        conn = cs_create_host(yazProxy, 1, &add);
-    else
-        conn = cs_create_host(arg, 1, &add);
+    conn = cs_create_host_proxy(arg, 1, &add, yazProxy);
     if (!conn)
     {
         printf("Could not resolve address %s\n", arg);
@@ -926,13 +923,16 @@ static void display_record(Z_External *r)
         const char *octet_buf = (const char*)r->u.octet_aligned->buf;
         size_t octet_len = r->u.octet_aligned->len;
         if (!oid_oidcmp(oid, yaz_oid_recsyn_xml)
-            || !oid_oidcmp(oid, yaz_oid_recsyn_xml)
+            || !oid_oidcmp(oid, yaz_oid_recsyn_application_xml)
             || !oid_oidcmp(oid, yaz_oid_recsyn_html))
         {
             print_xml_record(octet_buf, octet_len);
-
         }
-        else if (yaz_oid_is_iso2709(oid))
+        else if (!oid_oidcmp(oid, yaz_oid_recsyn_mab))
+        {
+            print_record(octet_buf, octet_len);
+        }
+        else
         {
             const char *result;
             size_t rlen;
@@ -978,17 +978,14 @@ static void display_record(Z_External *r)
             }
             else
             {
-                printf("bad MARC. Dumping as it is:\n");
+                if (yaz_oid_is_iso2709(oid))
+                     printf("bad MARC. Dumping as it is:\n");
                 print_record(octet_buf, octet_len);
             }
             yaz_marc_destroy(mt);
             if (cd)
                 yaz_iconv_close(cd);
         }
-        else
-        {
-            print_record(octet_buf, octet_len);
-        }
         marc_file_write(octet_buf, r->u.octet_aligned->len);
     }
     else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_sutrs))
@@ -4445,10 +4442,10 @@ static void http_response(Z_HTTP_Response *hres)
             if (ret == 0 && sr->which == Z_SRW_searchRetrieve_response)
                 handle_srw_response(sr->u.response);
             else if (ret == 0 && sr->which == Z_SRW_scan_response)
-            	handle_srw_scan_response(sr->u.scan_response);
+                handle_srw_scan_response(sr->u.scan_response);
             else
             {
-                printf("Decoding of SOLR package failed\n");
+                printf("Decoding of Solr package failed\n");
                 ret = -1;
             }
             odr_destroy(o);