X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoomtst3.c;h=769df73af0daa6f9d6c0e0523bb845f942c16dfd;hp=224db5f267bd6079d8f3634b81c2aa38cad43af6;hb=b6aa93dcb5c07ed09b664c006b5f33b0135a0854;hpb=20c29d8695afd66903288a1eabe259877b1dc79b

diff --git a/zoom/zoomtst3.c b/zoom/zoomtst3.c
index 224db5f..769df73 100644
--- a/zoom/zoomtst3.c
+++ b/zoom/zoomtst3.c
@@ -1,7 +1,6 @@
-/*
- * $Id: zoomtst3.c,v 1.8 2002-06-05 21:09:04 adam Exp $
- *
- * Asynchronous multi-target client doing search and piggyback retrieval
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
+ * See the file LICENSE for details.
  */
 
 #include <stdio.h>
@@ -24,14 +23,14 @@ int main(int argc, char **argv)
 
     if (argc < 3)
     {
-	fprintf (stderr, "usage:\n%s target1 target2 ... targetN query\n",
-		 *argv);
-	exit (1);
+        fprintf (stderr, "usage:\n%s target1 target2 ... targetN query\n"
+                         "%s number target query\n", *argv, *argv);
+        exit (1);
     }
     if (argc == 4 && isdigit(argv[1][0]) && !strchr(argv[1],'.'))
     {
-	no = atoi(argv[1]);
-	same_target = 1;
+        no = atoi(argv[1]);
+        same_target = 1;
     }
 
     if (no > 500)
@@ -50,14 +49,14 @@ int main(int argc, char **argv)
     /* connect to all */
     for (i = 0; i<no; i++)
     {
-	/* create connection - pass options (they are the same for all) */
-    	z[i] = ZOOM_connection_create (o);
+        /* create connection - pass options (they are the same for all) */
+        z[i] = ZOOM_connection_create (o);
 
-	/* connect and init */
-	if (same_target)
-    	    ZOOM_connection_connect (z[i], argv[2], 0);
-	else
-    	    ZOOM_connection_connect (z[i], argv[1+i], 0);
+        /* connect and init */
+        if (same_target)
+            ZOOM_connection_connect (z[i], argv[2], 0);
+        else
+            ZOOM_connection_connect (z[i], argv[1+i], 0);
     }
     /* search all */
     for (i = 0; i<no; i++)
@@ -66,42 +65,41 @@ 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 */
     for (i = 0; i<no; i++)
     {
-	int error;
-	const char *errmsg, *addinfo;
-	const char *tname = (same_target ? argv[2] : argv[1+i]);
-	/* display errors if any */
-	if ((error = ZOOM_connection_error(z[i], &errmsg, &addinfo)))
-	    fprintf (stderr, "%s error: %s (%d) %s\n", tname, errmsg,
-		     error, addinfo);
-	else
-	{
-	    /* OK, no major errors. Look at the result count */
-	    int pos;
-	    printf ("%s: %d hits\n", tname, ZOOM_resultset_size(r[i]));
-	    /* go through all records at target */
-	    for (pos = 0; pos < 10; pos++)
-	    {
-		int len; /* length of buffer rec */
-		const char *rec =
-		    ZOOM_record_get (
+        int error;
+        const char *errmsg, *addinfo;
+        const char *tname = (same_target ? argv[2] : argv[1+i]);
+        /* display errors if any */
+        if ((error = ZOOM_connection_error(z[i], &errmsg, &addinfo)))
+            fprintf (stderr, "%s error: %s (%d) %s\n", tname, errmsg,
+                     error, addinfo);
+        else
+        {
+            /* OK, no major errors. Look at the result count */
+            int pos;
+            printf ("%s: %ld hits\n", tname, (long) ZOOM_resultset_size(r[i]));
+            /* go through all records at target */
+            for (pos = 0; pos < 10; pos++)
+            {
+                int len; /* length of buffer rec */
+                const char *rec =
+                    ZOOM_record_get (
                         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");
-		}
-	    }
-	}
+                /* if rec is non-null, we got a record for display */
+                if (rec)
+                    printf ("%d\n%.*s\n", pos+1, len, rec);
+            }
+        }
     }
     /* destroy and exit */
     for (i = 0; i<no; i++)
@@ -112,3 +110,12 @@ int main(int argc, char **argv)
     ZOOM_options_destroy(o);
     exit (0);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+