ZOOM C: deal with excess bytes HTTPS case YAZ-833

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

diff --git a/zoom/zoomtst6.c b/zoom/zoomtst6.c
index b09ca8b..2ac31f7 100644 (file)
--- a/zoom/zoomtst6.c
+++ b/zoom/zoomtst6.c
@@ -1,7 +1,6 @@
-/*
- * $Id: zoomtst6.c,v 1.8 2001-11-28 23:00:19 adam Exp $
- *
- * Asynchronous multi-target client doing two searches
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
+ * See the file LICENSE for details.
  */
 
 #include <stdio.h>
@@ -14,7 +13,7 @@ static void display_records (const char *tname, ZOOM_resultset r)
 {
     /* OK, no major errors. Look at the result count */
     int pos;
-    printf ("%s: %d hits\n", tname, ZOOM_resultset_size(r));
+    printf ("%s: %ld hits\n", tname, (long) ZOOM_resultset_size(r));
     /* go through all records at target */
     for (pos = 0; pos < 4; pos++)
     {
@@ -30,8 +29,11 @@ static void display_records (const char *tname, ZOOM_resultset r)
             {
                 printf ("%d %s\n", pos+1, (db ? db : "unknown"));
                 if (render)
-                    fwrite (render, 1, len, stdout);
-                putchar ('\n');
+                {
+                    if (fwrite (render, 1, len, stdout) != (size_t) len)
+                        printf("write to stdout failed\n");
+                }
+                printf ("\n");
             }
         }
     }
@@ -50,9 +52,9 @@ int main(int argc, char **argv)
     o = ZOOM_options_create ();
     if (argc < 4)
     {
-       fprintf (stderr, "usage:\n%s target1 .. targetN query1 query2\n",
-                *argv);
-       exit (1);
+        fprintf (stderr, "usage:\n%s target1 .. targetN query1 query2\n",
+                 *argv);
+        exit (1);
     }
     if (no > 500)
         no = 500;
@@ -69,20 +71,20 @@ int main(int argc, char **argv)
     q = ZOOM_query_create ();
     if (ZOOM_query_prefix (q, argv[argc-2]))
     {
-       printf ("bad PQF: %s\n", argv[argc-2]);
-       exit (2);
+        printf ("bad PQF: %s\n", argv[argc-2]);
+        exit (2);
     }
     /* connect - and search all */
     for (i = 0; i<no; i++)
     {
-       z[i] = ZOOM_connection_create (o);
-       ZOOM_connection_connect (z[i], argv[i+1], 0);
+        z[i] = ZOOM_connection_create (o);
+        ZOOM_connection_connect (z[i], argv[i+1], 0);
         r1[i] = ZOOM_connection_search (z[i], q);
     }
     if (ZOOM_query_prefix (q, argv[argc-1]))
     {
-       printf ("bad sort spec: %s\n", argv[argc-1]);
-       exit (2);
+        printf ("bad prefix query: %s\n", argv[argc-1]);
+        exit (2);
     }
     /* queue second search */
     for (i = 0; i<no; i++)
@@ -94,22 +96,22 @@ int main(int argc, char **argv)
 
     /* network I/O */
     while (ZOOM_event (no, z))
-       ;
+        ;
 
     /* handle errors */
     for (i = 0; i<no; i++)
     {
-       int error;
-       const char *errmsg, *addinfo;
-       if ((error = ZOOM_connection_error(z[i], &errmsg, &addinfo)))
-           fprintf (stderr, "%s error: %s (%d) %s\n",
-                    ZOOM_connection_option_get(z[i], "host"),
-                    errmsg, error, addinfo);
-       else
-       {
-           display_records (ZOOM_connection_option_get(z[i], "host"), r1[i]);
-           display_records (ZOOM_connection_option_get(z[i], "host"), r2[i]);
-       }
+        int error;
+        const char *errmsg, *addinfo;
+        if ((error = ZOOM_connection_error(z[i], &errmsg, &addinfo)))
+            fprintf (stderr, "%s error: %s (%d) %s\n",
+                     ZOOM_connection_option_get(z[i], "host"),
+                     errmsg, error, addinfo);
+        else
+        {
+            display_records (ZOOM_connection_option_get(z[i], "host"), r1[i]);
+            display_records (ZOOM_connection_option_get(z[i], "host"), r2[i]);
+        }
     }
     /* destroy stuff and exit */
     ZOOM_query_destroy (q);
@@ -122,3 +124,12 @@ int main(int argc, char **argv)
     ZOOM_options_destroy(o);
     exit (0);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+