X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoomtst6.c;h=ecee61b00000789df402a2469f7a0c7706fb0a79;hp=a5a215c63419b4c1449a33757baa0afb42ec9430;hb=3b96525a40981e162b959f3e842e0ff20e314320;hpb=15f2d80b134fa41e213f6328440d1a25f80efd97

diff --git a/zoom/zoomtst6.c b/zoom/zoomtst6.c
index a5a215c..ecee61b 100644
--- a/zoom/zoomtst6.c
+++ b/zoom/zoomtst6.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoomtst6.c,v 1.5 2001-11-15 21:59:40 adam Exp $
+ * $Id: zoomtst6.c,v 1.9 2002-02-20 14:40:42 adam Exp $
  *
  * Asynchronous multi-target client doing two searches
  */
@@ -10,28 +10,30 @@
 
 #include <yaz/zoom.h>
 
-static void display_records (const char *tname, Z3950_resultset r)
+static void display_records (const char *tname, ZOOM_resultset r)
 {
     /* OK, no major errors. Look at the result count */
     int pos;
-    printf ("%s: %d hits\n", tname, Z3950_resultset_size(r));
+    printf ("%s: %d hits\n", tname, ZOOM_resultset_size(r));
     /* go through all records at target */
-    for (pos = 0; pos < 2; pos++)
+    for (pos = 0; pos < 4; pos++)
     {
-        Z3950_record rec = Z3950_resultset_record (r, pos);
-
-	/* get database for record and record itself at pos */
-	const char *db = Z3950_record_get (rec, "database", 0);
-	int len;
-	const char *render = Z3950_record_get (rec, "render", &len);
-	/* if rec is non-null, we got a record for display */
-	if (rec)
-	{
-	    printf ("%d %s\n", pos+1, (db ? db : "unknown"));
-	    if (render)
-		fwrite (render, 1, len, stdout);
-	    putchar ('\n');
-	}
+        ZOOM_record rec = ZOOM_resultset_record (r, pos);
+        if (rec)
+        {
+            /* get database for record and record itself at pos */
+            const char *db = ZOOM_record_get (rec, "database", 0);
+            int len;
+            const char *render = ZOOM_record_get (rec, "render", &len);
+            /* if rec is non-null, we got a record for display */
+            if (rec)
+            {
+                printf ("%d %s\n", pos+1, (db ? db : "unknown"));
+                if (render)
+                    fwrite (render, 1, len, stdout);
+                printf ("\n");
+            }
+        }
     }
 }
 
@@ -39,13 +41,13 @@ int main(int argc, char **argv)
 {
     int i;
     int no = argc-3;
-    Z3950_connection z[500];  /* allow at most 500 connections */
-    Z3950_resultset r1[500];  /* and result sets .. */
-    Z3950_resultset r2[500];  /* and result sets .. */
-    Z3950_query q;
-    Z3950_options o;
+    ZOOM_connection z[500];  /* allow at most 500 connections */
+    ZOOM_resultset r1[500];  /* and result sets .. */
+    ZOOM_resultset r2[500];  /* and result sets .. */
+    ZOOM_query q;
+    ZOOM_options o;
 
-    o = Z3950_options_create ();
+    o = ZOOM_options_create ();
     if (argc < 4)
     {
 	fprintf (stderr, "usage:\n%s target1 .. targetN query1 query2\n",
@@ -55,17 +57,17 @@ int main(int argc, char **argv)
     if (no > 500)
         no = 500;
 
-    Z3950_options_set (o, "async", "1");
+    ZOOM_options_set (o, "async", "1");
 
     /* get 3 (at most) records from beginning */
-    Z3950_options_set (o, "count", "3");
+    ZOOM_options_set (o, "count", "3");
 
-    Z3950_options_set (o, "preferredRecordSyntax", "sutrs");
-    Z3950_options_set (o, "elementSetName", "B");
+    ZOOM_options_set (o, "preferredRecordSyntax", "sutrs");
+    ZOOM_options_set (o, "elementSetName", "B");
 
     /* create query */
-    q = Z3950_query_create ();
-    if (Z3950_query_prefix (q, argv[argc-2]))
+    q = ZOOM_query_create ();
+    if (ZOOM_query_prefix (q, argv[argc-2]))
     {
 	printf ("bad PQF: %s\n", argv[argc-2]);
 	exit (2);
@@ -73,29 +75,25 @@ int main(int argc, char **argv)
     /* connect - and search all */
     for (i = 0; i<no; i++)
     {
-    	z[i] = Z3950_connection_create (o);
-    	Z3950_connection_connect (z[i], argv[i+1], 0);
-        r1[i] = Z3950_connection_search (z[i], q);
+    	z[i] = ZOOM_connection_create (o);
+    	ZOOM_connection_connect (z[i], argv[i+1], 0);
+        r1[i] = ZOOM_connection_search (z[i], q);
     }
-    if (Z3950_query_prefix (q, argv[argc-1]))
+    if (ZOOM_query_prefix (q, argv[argc-1]))
     {
 	printf ("bad sort spec: %s\n", argv[argc-1]);
 	exit (2);
     }
     /* queue second search */
     for (i = 0; i<no; i++)
-        r2[i] = Z3950_connection_search (z[i], q);
-
-
-    /* network I/O */
-    while (Z3950_event (no, z))
-	;
+        r2[i] = ZOOM_connection_search (z[i], q);
 
+    /* fetch 5th record from first result set as well */
     for (i = 0; i<no; i++)
-        Z3950_resultset_records (r1[i], 0, 4, 1);
+        ZOOM_resultset_records (r1[i], 0, 4, 1);
 
     /* network I/O */
-    while (Z3950_event (no, z))
+    while (ZOOM_event (no, z))
 	;
 
     /* handle errors */
@@ -103,24 +101,24 @@ int main(int argc, char **argv)
     {
 	int error;
 	const char *errmsg, *addinfo;
-	if ((error = Z3950_connection_error(z[i], &errmsg, &addinfo)))
+	if ((error = ZOOM_connection_error(z[i], &errmsg, &addinfo)))
 	    fprintf (stderr, "%s error: %s (%d) %s\n",
-		     Z3950_connection_host(z[i]),
+		     ZOOM_connection_option_get(z[i], "host"),
 		     errmsg, error, addinfo);
 	else
 	{
-	    display_records (Z3950_connection_host(z[i]), r1[i]);
-	    display_records (Z3950_connection_host(z[i]), r2[i]);
+	    display_records (ZOOM_connection_option_get(z[i], "host"), r1[i]);
+	    display_records (ZOOM_connection_option_get(z[i], "host"), r2[i]);
 	}
     }
     /* destroy stuff and exit */
-    Z3950_query_destroy (q);
+    ZOOM_query_destroy (q);
     for (i = 0; i<no; i++)
     {
-        Z3950_connection_destroy (z[i]);
-        Z3950_resultset_destroy (r1[i]);
-        Z3950_resultset_destroy (r2[i]);
+        ZOOM_connection_destroy (z[i]);
+        ZOOM_resultset_destroy (r1[i]);
+        ZOOM_resultset_destroy (r2[i]);
     }
-    Z3950_options_destroy(o);
+    ZOOM_options_destroy(o);
     exit (0);
 }