X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoomtst5.c;h=5061d13377c7373c2fe5b5ce1326160e5c41aa2f;hp=4acb072b3fcb0e907cfb59173136da23d758d3ab;hb=a0ff2572c63e4be9254b12d08b0166b6232477de;hpb=69bcd68523a9a8da083faef16887100369152673

diff --git a/zoom/zoomtst5.c b/zoom/zoomtst5.c
index 4acb072..5061d13 100644
--- 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.9 2002-02-28 13:21:16 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)
@@ -21,14 +22,12 @@ int main(int argc, char **argv)
 {
     int i;
     int no = argc-3;
-    Z3950_connection z[500]; /* allow at most 500 connections */
-    Z3950_resultset r[500];  /* and result sets .. */
-    Z3950_search s;
-    Z3950_options o;
-
-    nmem_init ();
+    ZOOM_connection z[500]; /* allow at most 500 connections */
+    ZOOM_resultset r[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 query sort\n",
@@ -39,23 +38,23 @@ int main(int argc, char **argv)
         no = 500;
 
     /* function my_callback called when reading options .. */
-    Z3950_options_set_callback (o, my_callback, 0);
+    ZOOM_options_set_callback (o, my_callback, 0);
 
     /* get 20 (at most) records from beginning */
-    Z3950_options_set (o, "count", "20");
+    ZOOM_options_set (o, "count", "20");
 
-    Z3950_options_set (o, "implementationName", "sortapp");
-    Z3950_options_set (o, "preferredRecordSyntax", "usmarc");
-    Z3950_options_set (o, "elementSetName", "B");
+    ZOOM_options_set (o, "implementationName", "sortapp");
+    ZOOM_options_set (o, "preferredRecordSyntax", "usmarc");
+    ZOOM_options_set (o, "elementSetName", "B");
 
     /* create query */
-    s = Z3950_search_create ();
-    if (Z3950_search_prefix (s, argv[argc-2]))
+    q = ZOOM_query_create ();
+    if (ZOOM_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 (ZOOM_query_sortby (q, argv[argc-1]))
     {
 	printf ("bad sort spec: %s\n", argv[argc-1]);
 	exit (1);
@@ -63,13 +62,13 @@ 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);
-        r[i] = Z3950_connection_search (z[i], s);
+    	z[i] = ZOOM_connection_create (o);
+    	ZOOM_connection_connect (z[i], argv[i+1], 0);
+        r[i] = ZOOM_connection_search (z[i], q);
     }
 
     /* network I/O */
-    while (Z3950_event (no, z))
+    while (ZOOM_event (no, z))
 	;
 
     /* handle errors */
@@ -77,29 +76,29 @@ 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
 	{
 	    /* OK, no major errors. Look at the result count */
 	    int pos;
-	    printf ("%s: %d hits\n", Z3950_connection_host(z[i]),
-		    Z3950_resultset_size(r[i]));
-	    /* go through all records at target */
+	    printf ("%s: %d hits\n", ZOOM_connection_option_get(z[i], "host"),
+		    ZOOM_resultset_size(r[i]));
+	    /* go through first 20 records at target */
 	    for (pos = 0; pos < 20; pos++)
 	    {
-		Z3950_record rec;
+		ZOOM_record rec;
 		const char *db, *syntax, *str;
 		int len;
 
-		rec = Z3950_resultset_record (r[i], pos);
+		rec = ZOOM_resultset_record (r[i], pos);
 		/* get database for record and record itself at pos */
 
-		db = Z3950_record_get (rec,  "database", 0);
-		str = Z3950_record_get (rec, "render", &len);
-		syntax = Z3950_record_get (rec, "syntax", &len);
+		db = ZOOM_record_get (rec,  "database", 0);
+		str = ZOOM_record_get (rec, "xml", &len);
+		syntax = ZOOM_record_get (rec, "syntax", &len);
 		/* if rec is non-null, we got a record for display */
 		if (str)
 		{
@@ -107,22 +106,19 @@ int main(int argc, char **argv)
 			    (db ? db : "unknown"));
 		    if (rec)
 			fwrite (str, 1, len, stdout);
-		    putchar ('\n');
+		    printf ("\n");
 		}
-		Z3950_record_destroy (rec);
 	    }
 	}
     }
 
     /* destroy stuff and exit */
-    Z3950_search_destroy (s);
+    ZOOM_query_destroy (q);
     for (i = 0; i<no; i++)
     {
-        Z3950_resultset_destroy (r[i]);
-        Z3950_connection_destroy (z[i]);
+        ZOOM_resultset_destroy (r[i]);
+        ZOOM_connection_destroy (z[i]);
     }
-    Z3950_options_destroy(o);
-    nmem_exit ();
-    xmalloc_trav("");
-    exit (0);
+    ZOOM_options_destroy(o);
+    exit(0);
 }