ZOOM changes.

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

diff --git a/zoom/zoomtst6.c b/zoom/zoomtst6.c
index 2745547..86f2d3e 100644 (file)
--- 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.3 2001-11-06 17:05:19 adam Exp $
  *
  * Asynchronous multi-target client doing two searches
  */
@@ -40,7 +40,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 +62,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 +73,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 +104,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]);