Removed Z3950_connection_host.

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

diff --git a/zoom/zoomtst6.c b/zoom/zoomtst6.c
index e3ea841..efb94da 100644 (file)
--- a/zoom/zoomtst6.c
+++ b/zoom/zoomtst6.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoomtst6.c,v 1.1 2001-10-23 21:00:20 adam Exp $
+ * $Id: zoomtst6.c,v 1.6 2001-11-16 09:52:39 adam Exp $
  *
  * Asynchronous multi-target client doing two searches
  */
@@ -16,18 +16,20 @@ static void display_records (const char *tname, Z3950_resultset r)
     int pos;
     printf ("%s: %d hits\n", tname, Z3950_resultset_size(r));
     /* go through all records at target */
-    for (pos = 0; pos < 20; pos++)
+    for (pos = 0; pos < 2; 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,11 +42,9 @@ 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;
 
-    nmem_init ();
-
     o = Z3950_options_create ();
     if (argc < 4)
     {
@@ -64,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);
@@ -75,16 +75,24 @@ 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))
+       ;
+
+    for (i = 0; i<no; i++)
+        Z3950_resultset_records (r1[i], 0, 4, 1);
 
     /* network I/O */
     while (Z3950_event (no, z))
@@ -97,16 +105,16 @@ int main(int argc, char **argv)
        const char *errmsg, *addinfo;
        if ((error = Z3950_connection_error(z[i], &errmsg, &addinfo)))
            fprintf (stderr, "%s error: %s (%d) %s\n",
-                    Z3950_connection_host(z[i]),
+                    Z3950_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 (Z3950_connection_option_get(z[i], "host"), r1[i]);
+           display_records (Z3950_connection_option_get(z[i], "host"), r2[i]);
        }
     }
     /* destroy stuff and exit */
-    Z3950_search_destroy (s);
+    Z3950_query_destroy (q);
     for (i = 0; i<no; i++)
     {
         Z3950_connection_destroy (z[i]);
@@ -114,7 +122,5 @@ int main(int argc, char **argv)
         Z3950_resultset_destroy (r2[i]);
     }
     Z3950_options_destroy(o);
-    nmem_exit ();
-    xmalloc_trav("");
     exit (0);
 }