Moved back to a single log.h, with the new #define YAZ_USE_NEW_LOG

[yaz-moved-to-github.git] / client / client.c

diff --git a/client/client.c b/client/client.c
index b46b330..5791eac 100644 (file)
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
  *
- * $Id: client.c,v 1.259 2004-12-09 07:53:21 adam Exp $
+ * $Id: client.c,v 1.261 2004-12-13 14:21:54 heikki Exp $
  */
 
 #include <stdio.h>
@@ -51,7 +51,7 @@
 #include <yaz/srw.h>
 #include <yaz/yaz-ccl.h>
 #include <yaz/cql.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
 
 #if HAVE_READLINE_READLINE_H
 #include <readline/readline.h>
@@ -2987,7 +2987,11 @@ int cmd_marccharset(const char *arg)
 
     *l1 = 0;
     if (sscanf(arg, "%29s", l1) < 1)
+    {
+       printf("MARC character set is `%s'\n", 
+               marcCharset ? marcCharset: "none");
         return 1;
+    }
     xfree (marcCharset);
     marcCharset = 0;
     if (strcmp(l1, "-"))
@@ -3021,8 +3025,6 @@ int cmd_displaycharset(const char *arg)
         }
         else if (strcmp(l1, "-") && strcmp(l1, "none"))
             outputCharset = xstrdup(l1);
-        else
-            printf ("Display character set conversion disabled\n");
     } 
     return 1;
 }
@@ -3045,26 +3047,27 @@ int cmd_negcharset(const char *arg)
         negotiationCharset = xstrdup(l1);
         printf ("Character set negotiation : %s\n", negotiationCharset);
     }
-    else
-        printf ("Character set negotiation disabled\n");
     return 1;
 }
 
 int cmd_charset(const char* arg)
 {
-    char l1[30], l2[30];
+    char l1[30], l2[30], l3[30];
 
-    *l1 = *l2 = 0;
-    if (sscanf(arg, "%29s %29s", l1, l2) < 1)
+    *l1 = *l2 = *l3 = 0;
+    if (sscanf(arg, "%29s %29s %29s", l1, l2, l3) < 1)
     {
        cmd_negcharset("");
        cmd_displaycharset("");
+       cmd_marccharset("");
     }
     else
     {
        cmd_negcharset(l1);
        if (*l2)
            cmd_displaycharset(l2);
+       if (*l3)
+           cmd_marccharset(l3);
     }
     return 1;
 }