X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoomtst7.c;h=2a6085f30798bc2bb78aef2c1c54764efbf5ab4f;hp=2de80f6fba815b6f7da7b87a26d47dc9cdd55288;hb=13671e7cc0f3dd4e4b02f94d64a50778c5696ba6;hpb=b340923765c14d2ba050a171bb557474044d7e6a

diff --git a/zoom/zoomtst7.c b/zoom/zoomtst7.c
index 2de80f6..2a6085f 100644
--- a/zoom/zoomtst7.c
+++ b/zoom/zoomtst7.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoomtst7.c,v 1.6 2001-11-15 08:58:29 adam Exp $
+ * $Id: zoomtst7.c,v 1.7 2001-11-18 21:14:23 adam Exp $
  *
  * API test..
  */
@@ -16,70 +16,71 @@
 int main(int argc, char **argv)
 {
     int i, j, block;
-    Z3950_connection z;
-    Z3950_resultset r[10];  /* and result sets .. */
-    Z3950_options o;
+    ZOOM_connection z;
+    ZOOM_resultset r[10];  /* and result sets .. */
+    ZOOM_options o;
 
-    o = Z3950_options_create ();
+    nmem_init ();
+    o = ZOOM_options_create ();
 
-    z = Z3950_connection_new ("localhost", 9999);
-    if (Z3950_connection_error (z, 0, 0))
+    z = ZOOM_connection_new ("localhost", 9999);
+    if (ZOOM_connection_error (z, 0, 0))
     {
         printf ("error - couldn't connect?\n");
         exit (1);
     }
         
-    Z3950_connection_destroy (z);
+    ZOOM_connection_destroy (z);
 
     for (block = 0; block < 3; block++)
     {
 	switch (block)
 	{
 	case 0:
-	    printf ("blocking - not calling Z3950_events\n");
+	    printf ("blocking - not calling ZOOM_events\n");
 	    break;
 	case 1:
-	    printf ("blocking - calling Z3950_events\n");
+	    printf ("blocking - calling ZOOM_events\n");
 	    break;
 	case 2:
-	    printf ("non-blocking - calling Z3950_events\n");
+	    printf ("non-blocking - calling ZOOM_events\n");
 	    break;
 	}
 	if (block > 1)
-	    Z3950_options_set (o, "async", "1");
+	    ZOOM_options_set (o, "async", "1");
 	for (i = 0; i<10; i++)
 	{
 	    char host[40];
 	    printf ("session %2d", i);
 	    sprintf (host, "localhost:9999/%d", i);
-	    z = Z3950_connection_create (o);
-	    Z3950_connection_connect (z, host, 0);
+	    z = ZOOM_connection_create (o);
+	    ZOOM_connection_connect (z, host, 0);
 	    
 	    for (j = 0; j < 10; j++)
 	    {
-		Z3950_record recs[2];
+		ZOOM_record recs[2];
 		char query[40];
-		Z3950_query s = Z3950_query_create ();
+		ZOOM_query s = ZOOM_query_create ();
 		
 		sprintf (query, "i%dr%d", i, j);
 		
-		if (Z3950_query_prefix (s, query))
+		if (ZOOM_query_prefix (s, query))
 		{
 		    printf ("bad PQF: %s\n", query);
 		    exit (2);
 		}
-		Z3950_options_set (o, "start", "0");
-		Z3950_options_set (o, "count", "0");
+		ZOOM_options_set (o, "start", "0");
+		ZOOM_options_set (o, "count", "0");
 		
-		r[j] = Z3950_connection_search (z, s); /* non-piggy */
+		r[j] = ZOOM_connection_search (z, s); /* non-piggy */
 		
-		Z3950_resultset_records (r[j], recs, 0, 2);  /* first two */
+		ZOOM_resultset_records (r[j], recs, 0, 2);  /* first two */
 		
-		Z3950_resultset_records (r[j], recs, 1, 2);  /* third */
+		ZOOM_resultset_records (r[j], recs, 1, 2);  /* third */
 
-		Z3950_resultset_records (r[j], recs, 0, 0);  /* ignored */
+		ZOOM_resultset_records (r[j], recs, 0, 0);  /* ignored */
 
-		if (Z3950_resultset_size (r[j]) > 2)
+		if (ZOOM_resultset_size (r[j]) > 2)
 		{
 		    if (!recs[0])
 		    {
@@ -88,30 +89,30 @@ int main(int argc, char **argv)
 		    }
 		}
 		
-		Z3950_query_destroy (s);
+		ZOOM_query_destroy (s);
 
 		putchar ('.');
 		if (block > 0)
-		    while (Z3950_event (1, &z))
+		    while (ZOOM_event (1, &z))
 			;
 	    }
 	    for (j = 0; j<i; j++)
-		Z3950_resultset_destroy (r[j]);
-	    Z3950_connection_destroy (z);
+		ZOOM_resultset_destroy (r[j]);
+	    ZOOM_connection_destroy (z);
 	    for (; j < 10; j++)
-		Z3950_resultset_destroy (r[j]);
+		ZOOM_resultset_destroy (r[j]);
 	    printf ("10 searches, 20 presents done\n");
 	}
 	
 	for (i = 0; i<1; i++)
 	{
-	    Z3950_query q = Z3950_query_create ();
+	    ZOOM_query q = ZOOM_query_create ();
 	    char host[40];
 
 	    printf ("session %2d", i+10);
 	    sprintf (host, "localhost:9999/%d", i);
-	    z = Z3950_connection_create (o);
-	    Z3950_connection_connect (z, host, 0);
+	    z = ZOOM_connection_create (o);
+	    ZOOM_connection_connect (z, host, 0);
 	    
 	    for (j = 0; j < 10; j++)
 	    {
@@ -119,31 +120,31 @@ int main(int argc, char **argv)
 		
 		sprintf (query, "i%dr%d", i, j);
 		
-		Z3950_options_set (o, "count", "0");
+		ZOOM_options_set (o, "count", "0");
 		
-		r[j] = Z3950_connection_search_pqf (z, query);
+		r[j] = ZOOM_connection_search_pqf (z, query);
 
 		putchar ('.');
 		if (block > 0)
-		    while (Z3950_event (1, &z))
+		    while (ZOOM_event (1, &z))
 			;
 	    }
-	    Z3950_connection_destroy (z);
+	    ZOOM_connection_destroy (z);
 	    
 	    for (j = 0; j < 10; j++)
 	    {
-		Z3950_resultset_records (r[j], 0, 0, 1);
+		ZOOM_resultset_records (r[j], 0, 0, 1);
 		if (block > 0)
-		    while (Z3950_event (1, &z))
+		    while (ZOOM_event (1, &z))
 			;
 	    }
 	    for (j = 0; j < 10; j++)
-		Z3950_resultset_destroy (r[j]);
-	    Z3950_query_destroy (q);
+		ZOOM_resultset_destroy (r[j]);
+	    ZOOM_query_destroy (q);
 	    printf ("10 searches, 10 ignored presents done\n");
 	}
     }
-    Z3950_options_destroy (o);
+    ZOOM_options_destroy (o);
     xmalloc_trav("");
     nmem_exit();
     xmalloc_trav("");