Avoid ctype.h .

[yaz-moved-to-github.git] / zoom / zoomtst3.c

diff --git a/zoom/zoomtst3.c b/zoom/zoomtst3.c
index 340d3bf..7366f94 100644 (file)
--- a/zoom/zoomtst3.c
+++ b/zoom/zoomtst3.c
@@ -1,12 +1,12 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2011 Index Data
  * See the file LICENSE for details.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
+#include <yaz/yaz-iconv.h>
 
 #include <yaz/xmalloc.h>
 
@@ -27,7 +27,7 @@ int main(int argc, char **argv)
                          "%s number target query\n", *argv, *argv);
         exit (1);
     }
-    if (argc == 4 && isdigit(argv[1][0]) && !strchr(argv[1],'.'))
+    if (argc == 4 && yaz_isdigit(argv[1][0]) && !strchr(argv[1],'.'))
     {
         no = atoi(argv[1]);
         same_target = 1;
@@ -66,9 +66,11 @@ int main(int argc, char **argv)
     while ((i = ZOOM_event (no, z)))
     {
         int peek = ZOOM_connection_peek_event(z[i-1]);
-        printf ("no = %d peek = %d event = %d\n", i-1,
+       int event = ZOOM_connection_last_event(z[i-1]);
+        printf ("no = %d peek = %d event = %d %s\n", i-1,
                 peek,
-                ZOOM_connection_last_event(z[i-1]));
+               event,
+               ZOOM_get_event_str(event));
     }
     
     /* no more to be done. Inspect results */