X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoomtst7.c;h=9a317bd108370f07677b5c1493057ef7c63e0767;hp=cc255dd57f044cb77f092d12dbb91d7dfb99777c;hb=11ed1645174d8ca8d8dcf5ef2bbe91e70a4a3e00;hpb=8d691989077a0addcbd840d769dce6700f3d9622

diff --git a/zoom/zoomtst7.c b/zoom/zoomtst7.c
index cc255dd..9a317bd 100644
--- a/zoom/zoomtst7.c
+++ b/zoom/zoomtst7.c
@@ -1,8 +1,7 @@
-/* $Id: zoomtst7.c,v 1.16 2007-01-03 08:42:17 adam Exp $  */
-
-/** \file zoomtst7.c
-    \brief Mix of operations
-*/
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
+ * See the file LICENSE for details.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,7 +20,6 @@ int main(int argc, char **argv)
     ZOOM_resultset r[10];  /* and result sets .. */
     ZOOM_options o;
 
-    nmem_init ();
     o = ZOOM_options_create ();
 
     z = ZOOM_connection_new ("localhost", 9999);
@@ -30,7 +28,7 @@ int main(int argc, char **argv)
         printf ("error - couldn't connect?\n");
         exit (1);
     }
-        
+
     ZOOM_connection_destroy (z);
 
     for (block = 0; block < 3; block++)
@@ -57,15 +55,15 @@ int main(int argc, char **argv)
             sprintf (host, "localhost:9999/%d", i);
             z = ZOOM_connection_create (o);
             ZOOM_connection_connect (z, host, 0);
-            
+
             for (j = 0; j < 10; j++)
             {
                 ZOOM_record recs[2];
                 char query[40];
                 ZOOM_query s = ZOOM_query_create ();
-                
+
                 sprintf (query, "i%dr%d", i, j);
-                
+
                 if (ZOOM_query_prefix (s, query))
                 {
                     printf ("bad PQF: %s\n", query);
@@ -73,11 +71,11 @@ int main(int argc, char **argv)
                 }
                 ZOOM_options_set (o, "start", "0");
                 ZOOM_options_set (o, "count", "0");
-                
+
                 r[j] = ZOOM_connection_search (z, s); /* non-piggy */
-                
+
                 ZOOM_resultset_records (r[j], recs, 0, 2);  /* first two */
-                
+
                 ZOOM_resultset_records (r[j], recs, 1, 2);  /* third */
 
                 ZOOM_resultset_records (r[j], recs, 0, 0);  /* ignored */
@@ -90,7 +88,7 @@ int main(int argc, char **argv)
                         exit (1);
                     }
                 }
-                
+
                 ZOOM_query_destroy (s);
 
                 printf (".");
@@ -116,15 +114,15 @@ int main(int argc, char **argv)
             sprintf (host, "localhost:9999/%d", i);
             z = ZOOM_connection_create (o);
             ZOOM_connection_connect (z, host, 0);
-            
+
             for (j = 0; j < 10; j++)
             {
                 char query[40];
-                
+
                 sprintf (query, "i%dr%d", i, j);
-                
+
                 ZOOM_options_set (o, "count", "0");
-                
+
                 r[j] = ZOOM_connection_search_pqf (z, query);
 
                 printf (".");
@@ -134,7 +132,7 @@ int main(int argc, char **argv)
             }
 
             ZOOM_connection_destroy (z);
-            
+
             for (j = 0; j < 10; j++)
             {
                 ZOOM_resultset_records (r[j], 0, 0, 1);
@@ -156,19 +154,20 @@ int main(int argc, char **argv)
             z = ZOOM_connection_create (o);
             ZOOM_connection_connect (z, host, 0);
 
-            scan = ZOOM_connection_scan (z, "@attr 1=4 a");
+            scan = ZOOM_connection_scan(z, "@attr 1=4 a");
             if (block > 0)
                 while (ZOOM_event (1, &z))
                     ;
             printf (" scan size = %ld\n", (long) ZOOM_scanset_size(scan));
-            for (j = 0; j<ZOOM_scanset_size (scan); j++)
+            for (j = 0; j < (int) ZOOM_scanset_size (scan); j++)
             {
-                int occur, len;
+                size_t len;
+                size_t occur;
                 const char *term;
                 term = ZOOM_scanset_term (scan, j, &occur, &len);
                 if (term)
-                    printf ("%d %.*s %d\n", j, len, term, occur);
-                
+                    printf ("%d %.*s %d\n", j, (int) len, term, (int) occur);
+
             }
             ZOOM_scanset_destroy (scan);
             ZOOM_connection_destroy (z);
@@ -182,6 +181,7 @@ int main(int argc, char **argv)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab