X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzoomtst7.c;h=39c4bbbbb50bf884a6ac116577ec42e567a74a75;hb=78942f568d83ea621661bfcd2d3f25eee3d316a1;hp=939d8bca57c8184d8c7005e3a00bc5a7f5f00d7e;hpb=69bcd68523a9a8da083faef16887100369152673;p=yaz-moved-to-github.git

diff --git a/zoom/zoomtst7.c b/zoom/zoomtst7.c
index 939d8bc..39c4bbb 100644
--- a/zoom/zoomtst7.c
+++ b/zoom/zoomtst7.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoomtst7.c,v 1.1 2001-10-23 21:00:20 adam Exp $
+ * $Id: zoomtst7.c,v 1.5 2001-11-13 22:57:03 adam Exp $
  *
  * API test..
  */
@@ -20,10 +20,17 @@ int main(int argc, char **argv)
     Z3950_resultset r[10];  /* and result sets .. */
     Z3950_options o;
 
-    nmem_init ();
-
     o = Z3950_options_create ();
 
+    z = Z3950_connection_new ("localhost", 9999);
+    if (Z3950_connection_error (z, 0, 0))
+    {
+        printf ("error - couldn't connect?\n");
+        exit (1);
+    }
+        
+    Z3950_connection_destroy (z);
+
     for (block = 0; block < 3; block++)
     {
 	switch (block)
@@ -53,11 +60,11 @@ int main(int argc, char **argv)
 		Z3950_record recs[2];
 		size_t recs_count = 2;
 		char query[40];
-		Z3950_search s = Z3950_search_create ();
+		Z3950_query s = Z3950_query_create ();
 		
 		sprintf (query, "i%dr%d", i, j);
 		
-		if (Z3950_search_prefix (s, query))
+		if (Z3950_query_prefix (s, query))
 		{
 		    printf ("bad PQF: %s\n", query);
 		    exit (2);
@@ -67,13 +74,13 @@ int main(int argc, char **argv)
 		
 		r[j] = Z3950_connection_search (z, s); /* non-piggy */
 		
-		Z3950_options_set (o, "count", "2");
-		Z3950_resultset_records (r[j], 0, 0);  /* first two */
+		Z3950_resultset_records (r[j], recs, 0, 2);  /* first two */
+		Z3950_record_destroy (recs[0]);
+		Z3950_record_destroy (recs[1]);
 		
-		Z3950_options_set (o, "start", "1");
-		Z3950_options_set (o, "count", "2");
-		Z3950_resultset_records (r[j], recs, &recs_count);  /* third */
-		Z3950_resultset_records (r[j], 0, 0);  /* ignored */
+		Z3950_resultset_records (r[j], recs, 1, 2);  /* third */
+
+		Z3950_resultset_records (r[j], recs, 0, 0);  /* ignored */
 
 		if (Z3950_resultset_size (r[j]) > 2)
 		{
@@ -86,7 +93,7 @@ int main(int argc, char **argv)
 		Z3950_record_destroy (recs[0]);
 		Z3950_record_destroy (recs[1]);
 		
-		Z3950_search_destroy (s);
+		Z3950_query_destroy (s);
 
 		putchar ('.');
 		if (block > 0)
@@ -103,7 +110,7 @@ int main(int argc, char **argv)
 	
 	for (i = 0; i<1; i++)
 	{
-	    Z3950_search s = Z3950_search_create ();
+	    Z3950_query q = Z3950_query_create ();
 	    char host[40];
 
 	    printf ("session %2d", i+10);
@@ -128,26 +135,20 @@ int main(int argc, char **argv)
 	    }
 	    Z3950_connection_destroy (z);
 	    
-	    Z3950_options_set (o, "count", "1");
 	    for (j = 0; j < 10; j++)
 	    {
-		Z3950_resultset_records (r[j], 0, 0);
+		Z3950_resultset_records (r[j], 0, 0, 1);
 		if (block > 0)
 		    while (Z3950_event (1, &z))
 			;
 	    }
 	    for (j = 0; j < 10; j++)
 		Z3950_resultset_destroy (r[j]);
-	    Z3950_search_destroy (s);
+	    Z3950_query_destroy (q);
 	    printf ("10 searches, 10 ignored presents done\n");
 	}
     }
     Z3950_options_destroy (o);
-    nmem_exit ();
-    xmalloc_trav("");
-
     exit (0);
 }
 
-
-