X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzoomtst6.c;h=910866d3eff251020b13db9cb10b27a6d74cafef;hb=02da040a0671d09dfe19790a53ff6408740e7cde;hp=27455475338423b0442b673886454caf95f60829;hpb=bc66c2a11aa31c16f46c49100e99dc9b7e940faf;p=yaz-moved-to-github.git

diff --git a/zoom/zoomtst6.c b/zoom/zoomtst6.c
index 2745547..910866d 100644
--- a/zoom/zoomtst6.c
+++ b/zoom/zoomtst6.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoomtst6.c,v 1.2 2001-10-24 12:24:43 adam Exp $
+ * $Id: zoomtst6.c,v 1.4 2001-11-15 08:58:29 adam Exp $
  *
  * Asynchronous multi-target client doing two searches
  */
@@ -18,16 +18,18 @@ static void display_records (const char *tname, Z3950_resultset r)
     /* go through all records at target */
     for (pos = 0; pos < 20; pos++)
     {
+        Z3950_record rec = Z3950_resultset_record (r, pos);
+
 	/* get database for record and record itself at pos */
-	const char *db = Z3950_resultset_get (r, pos, "database", 0);
+	const char *db = Z3950_record_get (rec, "database", 0);
 	int len;
-	const char *rec = Z3950_resultset_get (r, pos, "render", &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 (rec)
-		fwrite (rec, 1, len, stdout);
+	    if (render)
+		fwrite (render, 1, len, stdout);
 	    putchar ('\n');
 	}
     }
@@ -40,7 +42,7 @@ int main(int argc, char **argv)
     Z3950_connection z[500];  /* allow at most 500 connections */
     Z3950_resultset r1[500];  /* and result sets .. */
     Z3950_resultset r2[500];  /* and result sets .. */
-    Z3950_search s;
+    Z3950_query q;
     Z3950_options o;
 
     o = Z3950_options_create ();
@@ -62,8 +64,8 @@ int main(int argc, char **argv)
     Z3950_options_set (o, "elementSetName", "B");
 
     /* create query */
-    s = Z3950_search_create ();
-    if (Z3950_search_prefix (s, argv[argc-2]))
+    q = Z3950_query_create ();
+    if (Z3950_query_prefix (q, argv[argc-2]))
     {
 	printf ("bad PQF: %s\n", argv[argc-2]);
 	exit (2);
@@ -73,16 +75,16 @@ int main(int argc, char **argv)
     {
     	z[i] = Z3950_connection_create (o);
     	Z3950_connection_connect (z[i], argv[i+1], 0);
-        r1[i] = Z3950_connection_search (z[i], s);
+        r1[i] = Z3950_connection_search (z[i], q);
     }
-    if (Z3950_search_prefix (s, argv[argc-1]))
+    if (Z3950_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], s);
+        r2[i] = Z3950_connection_search (z[i], q);
 
     /* network I/O */
     while (Z3950_event (no, z))
@@ -104,7 +106,7 @@ int main(int argc, char **argv)
 	}
     }
     /* destroy stuff and exit */
-    Z3950_search_destroy (s);
+    Z3950_query_destroy (q);
     for (i = 0; i<no; i++)
     {
         Z3950_connection_destroy (z[i]);