ZOOM: record objects "owned" by result sets.

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

diff --git a/zoom/zoomtst5.c b/zoom/zoomtst5.c
index 4acb072..79fedab 100644 (file)
--- a/zoom/zoomtst5.c
+++ b/zoom/zoomtst5.c
@@ -1,13 +1,14 @@
 /*
- * $Id: zoomtst5.c,v 1.1 2001-10-23 21:00:20 adam Exp $
+ * $Id: zoomtst5.c,v 1.4 2001-11-15 08:58:29 adam Exp $
  *
  * Asynchronous multi-target client doing search, sort and present
  */
 
 #include <stdio.h>
+#include <string.h>
+
 #include <yaz/nmem.h>
 #include <yaz/xmalloc.h>
-
 #include <yaz/zoom.h>
 
 const char *my_callback (void *handle, const char *name)
@@ -23,11 +24,9 @@ int main(int argc, char **argv)
     int no = argc-3;
     Z3950_connection z[500]; /* allow at most 500 connections */
     Z3950_resultset r[500];  /* and result sets .. */
-    Z3950_search s;
+    Z3950_query q;
     Z3950_options o;
 
-    nmem_init ();
-
     o = Z3950_options_create ();
     if (argc < 4)
     {
@@ -49,13 +48,13 @@ 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 (1);
     }
-    if (Z3950_search_sortby (s, argv[argc-1]))
+    if (Z3950_query_sortby (q, argv[argc-1]))
     {
        printf ("bad sort spec: %s\n", argv[argc-1]);
        exit (1);
@@ -65,7 +64,7 @@ int main(int argc, char **argv)
     {
        z[i] = Z3950_connection_create (o);
        Z3950_connection_connect (z[i], argv[i+1], 0);
-        r[i] = Z3950_connection_search (z[i], s);
+        r[i] = Z3950_connection_search (z[i], q);
     }
 
     /* network I/O */
@@ -109,20 +108,17 @@ int main(int argc, char **argv)
                        fwrite (str, 1, len, stdout);
                    putchar ('\n');
                }
-               Z3950_record_destroy (rec);
            }
        }
     }
 
     /* destroy stuff and exit */
-    Z3950_search_destroy (s);
+    Z3950_query_destroy (q);
     for (i = 0; i<no; i++)
     {
         Z3950_resultset_destroy (r[i]);
         Z3950_connection_destroy (z[i]);
     }
     Z3950_options_destroy(o);
-    nmem_exit ();
-    xmalloc_trav("");
-    exit (0);
+    exit(0);
 }