X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoomtst3.c;h=7366f94deb6222546509d82a9c26e0f4f9129c96;hp=085b6ca29901738618385d75d30d9da5327ad3e5;hb=4f3bcae93d51a26709c12b51261c3d95af610cb2;hpb=78322aa6cb73f75c5772bd58c59fffef52597991

diff --git a/zoom/zoomtst3.c b/zoom/zoomtst3.c
index 085b6ca..7366f94 100644
--- a/zoom/zoomtst3.c
+++ b/zoom/zoomtst3.c
@@ -1,13 +1,12 @@
-/*
- * $Id: zoomtst3.c,v 1.10 2006-04-19 09:05:09 adam Exp $
- *
- * Asynchronous multi-target client doing search and piggyback retrieval
+/* This file is part of the YAZ toolkit.
+ * 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>
 
@@ -28,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,8 +65,12 @@ int main(int argc, char **argv)
     /* network I/O. pass number of connections and array of connections */
     while ((i = ZOOM_event (no, z)))
     {
-        printf ("no = %d event = %d\n", i-1,
-                ZOOM_connection_last_event(z[i-1]));
+        int peek = ZOOM_connection_peek_event(z[i-1]);
+	int event = ZOOM_connection_last_event(z[i-1]);
+        printf ("no = %d peek = %d event = %d %s\n", i-1,
+                peek,
+		event,
+		ZOOM_get_event_str(event));
     }
     
     /* no more to be done. Inspect results */
@@ -84,7 +87,7 @@ int main(int argc, char **argv)
         {
             /* OK, no major errors. Look at the result count */
             int pos;
-            printf ("%s: %d hits\n", tname, ZOOM_resultset_size(r[i]));
+            printf ("%s: %ld hits\n", tname, (long) ZOOM_resultset_size(r[i]));
             /* go through all records at target */
             for (pos = 0; pos < 10; pos++)
             {
@@ -94,12 +97,7 @@ int main(int argc, char **argv)
                         ZOOM_resultset_record (r[i], pos), "render", &len);
                 /* if rec is non-null, we got a record for display */
                 if (rec)
-                {
-                    printf ("%d\n", pos+1);
-                    if (rec)
-                        fwrite (rec, 1, len, stdout);
-                    printf ("\n");
-                }
+                    printf ("%d\n%.*s\n", pos+1, len, rec);
             }
         }
     }
@@ -115,6 +113,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab