X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2Fclient.c;h=ab8fa032d75ccc6234bf45151a9b6226f305ee45;hb=4d16fbc7b32700afd686bbaa51c2253d7f3287ec;hp=190616c9726d1b6c6a357799a36b4c77abb9fe46;hpb=c80275992d29b4815dd25d9203e094ae2880f1ae;p=yaz-moved-to-github.git

diff --git a/client/client.c b/client/client.c
index 190616c..ab8fa03 100644
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.210 2003-10-21 12:35:50 mike Exp $
+ * $Id: client.c,v 1.212 2003-11-02 17:59:28 adam Exp $
  */
 
 #include <stdio.h>
@@ -104,6 +104,8 @@ static char *refid = NULL;
 static char *last_open_command = NULL;
 static int auto_reconnect = 0;
 
+static char cur_host[200];
+
 typedef enum {
     QueryType_Prefix,
     QueryType_CCL,
@@ -478,10 +480,11 @@ static void render_diag(Z_DiagnosticFormat *diag) {
 	case Z_DiagnosticFormat_s_defaultDiagRec: {
 	    Z_DefaultDiagFormat *dd = ds->u.defaultDiagRec;
 	    /* ### should check `dd->diagnosticSetId' */
-	    printf("code=%d", *dd->condition);
+	    printf("code=%d (%s)", *dd->condition,
+		   diagbib1_str(*dd->condition));
 	    /* Both types of addinfo are the same, so use type-pun */
 	    if (dd->u.v2Addinfo != 0)
-		printf(", addinfo='%s'", dd->u.v2Addinfo);
+		printf(",\n\taddinfo='%s'", dd->u.v2Addinfo);
 	    break;
 	}
 	case Z_DiagnosticFormat_s_explicitDiagnostic:
@@ -628,7 +631,6 @@ int session_connect(const char *arg)
 
 int cmd_open(const char *arg)
 {
-    static char cur_host[200];
     if (arg)
     {
         strncpy (cur_host, arg, sizeof(cur_host)-1);
@@ -1125,7 +1127,7 @@ static int send_deleteResultSetRequest(const char *arg)
 static int send_srw(Z_SRW_PDU *sr)
 {
     const char *charset = negotiationCharset;
-    const char *host_port = 0;
+    const char *host_port = cur_host;
     char *path = 0;
     char ctype[50];
     Z_SOAP_Handler h[2] = {
@@ -1163,7 +1165,7 @@ static int send_srw(Z_SRW_PDU *sr)
             memcpy (h, cp0, cp1 - cp0);
             h[cp1-cp0] = '\0';
             z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers,
-                              "host", h);
+                              "Host", h);
         }
     }
 
@@ -1195,6 +1197,8 @@ static int send_srw(Z_SRW_PDU *sr)
         char *buf_out;
         int len_out;
         int r;
+	if (apdu_file && !z_GDU(print, &gdu, 0, 0))
+            printf ("Failed to print outgoing APDU\n");
         buf_out = odr_getbuf(out, &len_out, 0);
         
         /* we don't odr_reset(out), since we may need the buffer again */