X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoomtst5.c;h=21eccb158d019cc7a94b000d965553e55899f15a;hp=84e5819845dbc7e5358e59300662e579fe07d4dd;hb=5ef9ca5de57e415b34c21fe0d17a79f7b8e6b636;hpb=bc66c2a11aa31c16f46c49100e99dc9b7e940faf

diff --git a/zoom/zoomtst5.c b/zoom/zoomtst5.c
index 84e5819..21eccb1 100644
--- a/zoom/zoomtst5.c
+++ b/zoom/zoomtst5.c
@@ -1,7 +1,6 @@
-/*
- * $Id: zoomtst5.c,v 1.2 2001-10-24 12:24:43 adam Exp $
- *
- * Asynchronous multi-target client doing search, sort and present
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
+ * See the file LICENSE for details.
  */
 
 #include <stdio.h>
@@ -11,114 +10,135 @@
 #include <yaz/xmalloc.h>
 #include <yaz/zoom.h>
 
-const char *my_callback (void *handle, const char *name)
+const char *my_callback(void *handle, const char *name)
 {
-    if (!strcmp (name, "async"))
-	return "1";
+    if (!strcmp(name, "async"))
+        return "1";
     return 0;
 }
 
 int main(int argc, char **argv)
 {
     int i;
-    int no = argc-3;
-    Z3950_connection z[500]; /* allow at most 500 connections */
-    Z3950_resultset r[500];  /* and result sets .. */
-    Z3950_search s;
-    Z3950_options o;
+    int no = argc - 4;
+    ZOOM_connection z[500]; /* allow at most 500 connections */
+    ZOOM_resultset r[500];  /* and result sets .. */
+    ZOOM_query q;
+    ZOOM_options o;
 
-    o = Z3950_options_create ();
-    if (argc < 4)
+    o = ZOOM_options_create();
+    if (argc < 5)
     {
-	fprintf (stderr, "usage:\n%s target1 .. targetN query sort\n",
-		 *argv);
-	exit (2);
+        fprintf(stderr, "usage:\n%s target1 .. targetN query strategy sort\n",
+                *argv);
+        exit(2);
     }
     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 beginning */
-    Z3950_options_set (o, "count", "20");
+    ZOOM_options_set(o, "count", "20");
 
-    Z3950_options_set (o, "implementationName", "sortapp");
-    Z3950_options_set (o, "preferredRecordSyntax", "usmarc");
-    Z3950_options_set (o, "elementSetName", "B");
+    ZOOM_options_set(o, "implementationName", "sortapp");
+    ZOOM_options_set(o, "preferredRecordSyntax", "usmarc");
+    ZOOM_options_set(o, "elementSetName", "B");
 
     /* create query */
-    s = Z3950_search_create ();
-    if (Z3950_search_prefix (s, argv[argc-2]))
+    q = ZOOM_query_create();
+    if (strncmp("cql:", argv[argc-3], 4) == 0)
+    {
+        if (ZOOM_query_cql(q, argv[argc-3] + 4))
+        {
+            printf("bad CQL: %s\n", argv[argc-3] + 4);
+            exit(1);
+        }
+    }
+    else if (ZOOM_query_prefix(q, argv[argc-3]))
     {
-	printf ("bad PQF: %s\n", argv[argc-2]);
-	exit (1);
+        printf("bad PQF: %s\n", argv[argc-3]);
+        exit(1);
     }
-    if (Z3950_search_sortby (s, argv[argc-1]))
+    if (ZOOM_query_sortby2(q, argv[argc-2], argv[argc-1]))
     {
-	printf ("bad sort spec: %s\n", argv[argc-1]);
-	exit (1);
+        printf("bad sort spec: %s\n", argv[argc-1]);
+        exit(1);
     }
     /* connect - and search all */
-    for (i = 0; i<no; i++)
+    for (i = 0; i < no; i++)
     {
-    	z[i] = Z3950_connection_create (o);
-    	Z3950_connection_connect (z[i], argv[i+1], 0);
-        r[i] = Z3950_connection_search (z[i], s);
+        z[i] = ZOOM_connection_create(o);
+        ZOOM_connection_connect(z[i], argv[i+1], 0);
+        r[i] = ZOOM_connection_search(z[i], q);
     }
 
     /* network I/O */
-    while (Z3950_event (no, z))
-	;
+    while (ZOOM_event(no, z))
+        ;
 
     /* handle errors */
-    for (i = 0; i<no; i++)
+    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);
-	else
-	{
-	    /* OK, no major errors. Look at the result count */
-	    int pos;
-	    printf ("%s: %d hits\n", Z3950_connection_host(z[i]),
-		    Z3950_resultset_size(r[i]));
-	    /* go through all records at target */
-	    for (pos = 0; pos < 20; pos++)
-	    {
-		Z3950_record rec;
-		const char *db, *syntax, *str;
-		int len;
+        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
+        {
+            /* OK, no major errors. Look at the result count */
+            int pos;
+            printf("%s: %ld hits\n", ZOOM_connection_option_get(z[i], "host"),
+                   (long) ZOOM_resultset_size(r[i]));
+            /* go through first 20 records at target */
+            for (pos = 0; pos < 20; pos++)
+            {
+                ZOOM_record rec;
+                const char *db, *syntax, *str;
+                int record_len, syntax_len;
 
-		rec = Z3950_resultset_record (r[i], pos);
-		/* get database for record and record itself at pos */
+                rec = ZOOM_resultset_record(r[i], pos);
+                /* get database for record and record itself at pos */
 
-		db = Z3950_record_get (rec,  "database", 0);
-		str = Z3950_record_get (rec, "render", &len);
-		syntax = Z3950_record_get (rec, "syntax", &len);
-		/* if rec is non-null, we got a record for display */
-		if (str)
-		{
-		    printf ("%d %s %s\n", pos+1, syntax, 
-			    (db ? db : "unknown"));
-		    if (rec)
-			fwrite (str, 1, len, stdout);
-		    putchar ('\n');
-		}
-		Z3950_record_destroy (rec);
-	    }
-	}
+                db = ZOOM_record_get(rec,  "database", 0);
+                str = ZOOM_record_get(rec, "xml", &record_len);
+                syntax = ZOOM_record_get(rec, "syntax", &syntax_len);
+                /* if rec is non-null, we got a record for display */
+                if (str)
+                {
+                    printf("%d %s %s\n", pos+1, syntax,
+                           (db ? db : "unknown"));
+                    if (rec)
+                    {
+                        if (fwrite(str, 1, record_len, stdout) !=
+                            (size_t) record_len)
+                            printf("write to stdout failed\n");
+                    }
+                    printf("\n");
+                }
+            }
+        }
     }
 
     /* destroy stuff and exit */
-    Z3950_search_destroy (s);
-    for (i = 0; i<no; i++)
+    ZOOM_query_destroy(q);
+    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);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+