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

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

diff --git a/zoom/zoomtst4.c b/zoom/zoomtst4.c
index cdba94c..3962561 100644 (file)
--- a/zoom/zoomtst4.c
+++ b/zoom/zoomtst4.c
@@ -1,8 +1,6 @@
-/*
- * $Id: zoomtst4.c,v 1.3 2001-11-06 17:05:19 adam Exp $
- *
- * Asynchronous multi-target going through proxy doing search and retrieve
- * using present.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
+ * See the file LICENSE for details.

  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

@@ -14,7 +12,7 @@
 const char *my_callback (void *handle, const char *name)
 {
     if (!strcmp (name, "async"))
 const char *my_callback (void *handle, const char *name)
 {
     if (!strcmp (name, "async"))

-       return "1";
+        return "1";

     return 0;
 }
 
     return 0;
 }
 

@@ -22,66 +20,81 @@ int main(int argc, char **argv)
 {
     int i;
     int no = argc-3;
 {
     int i;
     int no = argc-3;

-    Z3950_connection z[500]; /* allow at most 500 connections */
-    Z3950_resultset r[500];  /* and result sets .. */
-    Z3950_query q;
-    Z3950_options o = Z3950_options_create ();
+    ZOOM_connection z[500]; /* allow at most 500 connections */
+    ZOOM_resultset r[500];  /* and result sets .. */
+    ZOOM_query q;
+    ZOOM_options o = ZOOM_options_create ();

 
     if (argc < 4)
     {
 
     if (argc < 4)
     {

-       fprintf (stderr, "usage:\n%s proxy target1 .. targetN query\n",
-                *argv);
-       exit (2);
+        fprintf (stderr, "usage:\n%s proxy target1 .. targetN query\n",
+                 *argv);
+        exit (2);

     }
     if (no > 500)
         no = 500;
 
     /* function my_callback called when reading options .. */
     }
     if (no > 500)
         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 offset 5 */
 
     /* get 20 (at most) records from offset 5 */

-    Z3950_options_set (o, "start", "5");
-    Z3950_options_set (o, "count", "20");
+    ZOOM_options_set (o, "start", "5");
+    ZOOM_options_set (o, "count", "20");
+    ZOOM_options_set (o, "schema", "gils-schema");
+    ZOOM_options_set (o, "elementSetName", "F");

 
     /* set proxy */
 
     /* set proxy */

-    Z3950_options_set (o, "proxy", argv[1]);
-    
+    ZOOM_options_set (o, "proxy", argv[1]);
+

     /* create query */
     /* create query */

-    q = Z3950_query_create ();
-    if (Z3950_query_prefix (q, argv[argc-1]))
+    q = ZOOM_query_create ();
+    if (ZOOM_query_prefix (q, argv[argc-1]))

     {
     {

-       printf ("bad PQF: %s\n", argv[argc-1]);
-       exit (1);
+        printf ("bad PQF: %s\n", argv[argc-1]);
+        exit (1);

     }
     /* connect - and search all */
     for (i = 0; i<no; i++)
     {
     }
     /* connect - and search all */
     for (i = 0; i<no; i++)
     {

-       z[i] = Z3950_connection_create (o);
-       Z3950_connection_connect (z[i], argv[i+2], 0);
-        r[i] = Z3950_connection_search (z[i], q);
+        z[i] = ZOOM_connection_create (o);
+        ZOOM_connection_connect (z[i], argv[i+2], 0);
+        r[i] = ZOOM_connection_search (z[i], q);

     }
 
     /* network I/O */
     }
 
     /* network I/O */

-    while (Z3950_event (no, z))
-       ;
+    while (ZOOM_event (no, z))
+        ;

 
     /* handle errors */
     for (i = 0; i<no; i++)
     {
 
     /* handle errors */
     for (i = 0; i<no; i++)
     {

-       int error;
-       const char *errmsg, *addinfo;
-       if ((error = Z3950_connection_error(z[i], &errmsg, &addinfo)))
-           fprintf (stderr, "%s error: %s (%d) %s\n",
-                    Z3950_connection_host(z[i]), errmsg, error, addinfo);
+        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
+            printf ("%s: %ld hits\n", ZOOM_connection_option_get(z[i], "host"),
+                    (long) ZOOM_resultset_size(r[i]));

     }
 
     /* destroy stuff and exit */
     }
 
     /* destroy stuff and exit */

-    Z3950_query_destroy (q);
+    ZOOM_query_destroy (q);

     for (i = 0; i<no; i++)
     {
     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);
+    ZOOM_options_destroy(o);

     exit (0);
 }
     exit (0);
 }

+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+