X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=26aab7b54f840f4bfc48c341be56fccf2c860eb9;hp=342e54666d308ece331283e601113a953de66e8f;hb=80184e0ebd6d82ad97874372236c2ad956e01d72;hpb=f1fef5aeb2f4aad16d5c66e7ed4b58def0a26464

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 342e546..26aab7b 100644
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,13 +1,20 @@
-/*
- * $Id: zoomsh.c,v 1.25 2004-01-12 12:10:44 adam Exp $
- *
- * ZOOM-C Shell
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2012 Index Data
+ * See the file LICENSE for details.
  */
+/** \file zoomsh.c
+    \brief ZOOM C command line tool (shell)
+*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
+#include <yaz/wrbuf.h>
+#include <yaz/log.h>
+#include <yaz/options.h>
 
 #if HAVE_READLINE_READLINE_H
 #include <readline/readline.h> 
@@ -16,21 +23,34 @@
 #include <readline/history.h>
 #endif
 
-#include <yaz/xmalloc.h>
-
 #include <yaz/log.h>
-#include <yaz/nmem.h>
 #include <yaz/zoom.h>
-#include <yaz/oid.h>
 
 #define MAX_CON 100
 
-static int next_token (const char **cpp, const char **t_start)
+static void process_events(ZOOM_connection *c)
+{
+    int i;
+
+    yaz_log(YLOG_DEBUG, "process_events");
+    while ((i = ZOOM_event(MAX_CON, c)) != 0)
+    {
+        int peek = ZOOM_connection_peek_event(c[i-1]);
+        int event = ZOOM_connection_last_event(c[i-1]);
+        yaz_log(YLOG_DEBUG, "no = %d peek = %d event = %d %s", i-1,
+                peek,
+                event,
+                ZOOM_get_event_str(event));
+    }
+}
+
+static int next_token_chars(const char **cpp, const char **t_start,
+                            const char *tok_chars)
 {
     int len = 0;
     const char *cp = *cpp;
     while (*cp == ' ')
-	cp++;
+        cp++;
     if (*cp == '"')
     {
         cp++;
@@ -46,7 +66,7 @@ static int next_token (const char **cpp, const char **t_start)
     else
     {
         *t_start = cp;
-        while (*cp && *cp != ' ' && *cp != '\r' && *cp != '\n')
+        while (*cp && !strchr(tok_chars, *cp))
         {
             cp++;
             len++;
@@ -58,498 +78,826 @@ static int next_token (const char **cpp, const char **t_start)
     return len;  /* return -1 if no token was read .. */
 }
 
-static int next_token_copy (const char **cpp, char *buf_out, int buf_max)
+static int next_token(const char **cpp, const char **t_start)
+{
+    return next_token_chars(cpp, t_start, "\r\n ");
+}
+
+
+static WRBUF next_token_new_wrbuf(const char **cpp)
 {
+    WRBUF w = 0;
     const char *start;
-    int len = next_token (cpp, &start);
+    int len = next_token(cpp, &start);
     if (len < 0)
-    {
-	*buf_out = 0;
-	return len;
-    }
-    if (len >= buf_max)
-	len = buf_max-1;
-    memcpy (buf_out, start, len);
-    buf_out[len] = '\0';
-    return len;
+        return 0;
+    w = wrbuf_alloc();
+    if (len > 0)
+        wrbuf_write(w, start, len);
+    return w;
 }
 
-static int is_command (const char *cmd_str, const char *this_str, int this_len)
+static int is_command(const char *cmd_str, const char *this_str, int this_len)
 {
     int cmd_len = strlen(cmd_str);
     if (cmd_len != this_len)
-	return 0;
-    if (memcmp (cmd_str, this_str, cmd_len))
-	return 0;
+        return 0;
+    if (memcmp(cmd_str, this_str, cmd_len))
+        return 0;
     return 1;
 }
 
-static void cmd_set (ZOOM_connection *c, ZOOM_resultset *r,
-		     ZOOM_options options,
-		     const char **args)
+static int cmd_set(ZOOM_connection *c, ZOOM_resultset *r,
+                   ZOOM_options options,
+                   const char **args)
 {
-    char key[40], val[80];
+    WRBUF key;
+    const char *val_buf;
+    int val_len;
+
+    if (!(key = next_token_new_wrbuf(args)))
+    {
+        printf("missing argument for set\n");
+        return 1;
+    }
+    val_len = next_token_chars(args, &val_buf, "");
+    if (val_len != -1)
+        ZOOM_options_setl(options, wrbuf_cstr(key), val_buf, val_len);
+    else
+        ZOOM_options_set(options, wrbuf_cstr(key), 0);
+    wrbuf_destroy(key);
+    return 0;
+}
 
-    if (next_token_copy (args, key, sizeof(key)) < 0)
+static int cmd_get(ZOOM_connection *c, ZOOM_resultset *r,
+                   ZOOM_options options,
+                   const char **args)
+{
+    WRBUF key;
+    if (!(key = next_token_new_wrbuf(args)))
     {
-	printf ("missing argument for set\n");
-	return ;
+        printf("missing argument for get\n");
+        return 1;
     }
-    if (next_token_copy (args, val, sizeof(val)) < 0)
-	ZOOM_options_set(options, key, 0);
     else
-	ZOOM_options_set(options, key, val);
+    {
+        const char *val = ZOOM_options_get(options, wrbuf_cstr(key));
+        printf("%s = %s\n", wrbuf_cstr(key), val ? val : "<null>");
+        wrbuf_destroy(key);
+    }
+    return 0;
 }
 
-static void cmd_get (ZOOM_connection *c, ZOOM_resultset *r,
-		     ZOOM_options options,
-		     const char **args)
+static int cmd_rget(ZOOM_connection *c, ZOOM_resultset *r,
+                    ZOOM_options options,
+                     const char **args)
 {
-    char key[40];
-    if (next_token_copy (args, key, sizeof(key)) < 0)
+    WRBUF key;
+    if (!(key = next_token_new_wrbuf(args)))
     {
-	printf ("missing argument for get\n");
+        printf("missing argument for get\n");
+        return 1;
     }
     else
     {
-        const char *val = ZOOM_options_get(options, key);
-        printf ("%s = %s\n", key, val ? val : "<null>");
+        int i;
+        for (i = 0; i<MAX_CON; i++)
+        {
+            const char *val;
+            if (!r[i])
+                continue;
+            
+            val = ZOOM_resultset_option_get(r[i], wrbuf_cstr(key));
+            printf("%s = %s\n", wrbuf_cstr(key), val ? val : "<null>");
+        }
+        wrbuf_destroy(key);
     }
+    return 0;
 }
 
-static void cmd_close (ZOOM_connection *c, ZOOM_resultset *r,
-		       ZOOM_options options,
-		       const char **args)
+static int cmd_close(ZOOM_connection *c, ZOOM_resultset *r,
+                     ZOOM_options options,
+                     const char **args)
 {
-    char host[60];
+    WRBUF host;
     int i;
-    next_token_copy (args, host, sizeof(host));
+    host = next_token_new_wrbuf(args);
     for (i = 0; i<MAX_CON; i++)
     {
-	const char *h;
-	if (!c[i])
-	    continue;
-	if ((h = ZOOM_connection_option_get(c[i], "host"))
-            && !strcmp (h, host))
-	{
-	    ZOOM_connection_destroy (c[i]);
-	    c[i] = 0;
-	}
-	else if (*host == '\0')
-	{
-	    ZOOM_connection_destroy (c[i]);
-	    c[i] = 0;
-	}
+        const char *h;
+        if (!c[i])
+            continue;
+        if (!host)
+        {
+            ZOOM_connection_destroy(c[i]);
+            c[i] = 0;
+        }
+        else if ((h = ZOOM_connection_option_get(c[i], "host"))
+                 && !strcmp(h, wrbuf_cstr(host)))
+        {
+            ZOOM_connection_destroy(c[i]);
+            c[i] = 0;
+        }
     }
+    if (host)
+        wrbuf_destroy(host);
+    return 0;
 }
 
-static void display_records (ZOOM_connection c,
-			     ZOOM_resultset r,
-			     int start, int count)
+static void display_records(ZOOM_connection c,
+                            ZOOM_resultset r,
+                            size_t start, size_t count, const char *type)
+{
+    size_t i;
+    for (i = 0; i < count; i++)
+    {
+        size_t pos = i + start;
+        ZOOM_record rec = ZOOM_resultset_record(r, pos);
+        const char *db = ZOOM_record_get(rec, "database", 0);
+        
+        if (ZOOM_record_error(rec, 0, 0, 0))
+        {
+            const char *msg;
+            const char *addinfo;
+            const char *diagset;
+            int error = ZOOM_record_error(rec, &msg, &addinfo, &diagset);
+            
+            printf("%lld %s: %s (%s:%d) %s\n", (long long) pos,
+                   (db ? db : "unknown"),
+                   msg, diagset, error, addinfo ? addinfo : "none");
+        }
+        else
+        {
+            int len;
+            const char *render = ZOOM_record_get(rec, type, &len);
+            const char *syntax = ZOOM_record_get(rec, "syntax", 0);
+            const char *schema = ZOOM_record_get(rec, "schema", 0);
+            /* if rec is non-null, we got a record for display */
+            if (rec)
+            {
+                printf("%lld database=%s syntax=%s schema=%s\n",
+                       (long long) pos, (db ? db : "unknown"), syntax,
+                       schema ? schema : "unknown");
+                if (render)
+                {
+                    if (fwrite(render, 1, len, stdout) != (size_t) len)
+                    {
+                        printf("write to stdout failed\n");
+                    }
+                }
+                printf("\n");
+            }
+        }
+    }
+}
+
+static int cmd_show(ZOOM_connection *c, ZOOM_resultset *r,
+                    ZOOM_options options,
+                    const char **args)
 {
     int i;
-    for (i = 0; i<count; i++)
-    {
-	int pos = i + start;
-        ZOOM_record rec = ZOOM_resultset_record (r, pos);
-	const char *db = ZOOM_record_get (rec, "database", 0);
-	int len, opac_len;
-	const char *render = ZOOM_record_get (rec, "render", &len);
-	const char *opac_render = ZOOM_record_get (rec, "opac", &opac_len);
-	const char *syntax = ZOOM_record_get (rec, "syntax", 0);
-	/* if rec is non-null, we got a record for display */
-	if (rec)
-	{
-	    char oidbuf[100];
-	    (void) oid_name_to_dotstring(CLASS_RECSYN, syntax, oidbuf);
-	    printf ("%d %s %s (%s)\n",
-		    pos+1, (db ? db : "unknown"), syntax, oidbuf);
-	    if (render)
-		fwrite (render, 1, len, stdout);
-	    printf ("\n");
-	    if (opac_render)
-		fwrite (opac_render, 1, opac_len, stdout);
-	}
-	    
+    size_t start = 0, count = 1;
+    const char *type = "render";
+    WRBUF render_str = 0;
+    int ret = 0;
+
+    {
+        WRBUF tmp;
+
+        if ((tmp = next_token_new_wrbuf(args)))
+        {
+            start = atoi(wrbuf_cstr(tmp));
+            wrbuf_destroy(tmp);
+        }
+
+        if ((tmp = next_token_new_wrbuf(args)))
+        {
+            count = atoi(wrbuf_cstr(tmp));
+            wrbuf_destroy(tmp);
+        }
+        render_str = next_token_new_wrbuf(args);
+    }
+    if (render_str)
+        type = wrbuf_cstr(render_str);
+
+    for (i = 0; i < MAX_CON; i++)
+        ZOOM_resultset_records(r[i], 0, start, count);
+    process_events(c);
+
+    for (i = 0; i < MAX_CON; i++)
+    {
+        int error;
+        const char *errmsg, *addinfo, *dset;
+        /* display errors if any */
+        if (!c[i])
+            continue;
+        if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
+        {
+            printf("%s error: %s (%s:%d) %s\n",
+                   ZOOM_connection_option_get(c[i], "host"), errmsg,
+                   dset, error, addinfo);
+            ret = 1;
+        }
+        else if (r[i])
+        {
+            /* OK, no major errors. Display records... */
+            display_records(c[i], r[i], start, count, type);
+        }
     }
+    if (render_str)
+        wrbuf_destroy(render_str);
+    return ret;
 }
 
-static void cmd_show (ZOOM_connection *c, ZOOM_resultset *r,
-		      ZOOM_options options,
-		      const char **args)
+static void display_facets(ZOOM_facet_field *facets, int count) {
+    int index;
+    printf("Facets: \n");
+    for (index = 0; index <  count; index++) {
+        int term_index;
+        const char *facet_name = ZOOM_facet_field_name(facets[index]);
+        printf("  %s: \n", facet_name);
+        for (term_index = 0; term_index < ZOOM_facet_field_term_count(facets[index]); term_index++) {
+            int freq = 0;
+            const char *term = ZOOM_facet_field_get_term(facets[index], term_index, &freq);
+            printf("    %s(%d) \n", term,  freq);
+        }
+    }
+}
+
+static int cmd_facets(ZOOM_connection *c, ZOOM_resultset *r,
+                      ZOOM_options options,
+                      const char **args)
 {
     int i;
-    char start_str[10], count_str[10];
+    int ret = 0;
 
-    if (next_token_copy (args, start_str, sizeof(start_str)) >= 0)
-	ZOOM_options_set (options, "start", start_str);
+    process_events(c);
+
+    for (i = 0; i < MAX_CON; i++)
+    {
+        int error;
+        const char *errmsg, *addinfo, *dset;
+        /* display errors if any */
+        if (!c[i])
+            continue;
+        if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
+        {
+            printf("%s error: %s (%s:%d) %s\n",
+                   ZOOM_connection_option_get(c[i], "host"), errmsg,
+                   dset, error, addinfo);
+            ret = 1;
+        }
+        else if (r[i])
+        {
+            int num_facets = ZOOM_resultset_facets_size(r[i]);
+            if (num_facets) {
+                ZOOM_facet_field  *facets = ZOOM_resultset_facets(r[i]);
+                display_facets(facets, num_facets);
+            }
+        }
+    }
+    return ret;
+}
 
-    if (next_token_copy (args, count_str, sizeof(count_str)) >= 0)
-	ZOOM_options_set (options, "count", count_str);
+static int cmd_suggestions(ZOOM_connection *c, ZOOM_resultset *r, ZOOM_options options, const char **args)
+{
+    int i;
+    int ret = 0;
 
-    for (i = 0; i<MAX_CON; i++)
-	ZOOM_resultset_records (r[i], 0, atoi(start_str), atoi(count_str));
-    while (ZOOM_event (MAX_CON, c))
-	;
+    process_events(c);
 
-    for (i = 0; i<MAX_CON; i++)
+    for (i = 0; i < MAX_CON; i++)
     {
-	int error;
-	const char *errmsg, *addinfo, *dset;
-	/* display errors if any */
-	if (!c[i])
-	    continue;
-	if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
-	    printf ("%s error: %s (%s:%d) %s\n",
-		     ZOOM_connection_option_get(c[i], "host"), errmsg,
-		     dset, error, addinfo);
-	else if (r[i])
-	{
-	    /* OK, no major errors. Display records... */
-	    int start = ZOOM_options_get_int (options, "start", 0);
-	    int count = ZOOM_options_get_int (options, "count", 0);
-	    display_records (c[i], r[i], start, count);
-	}
-    }
-    ZOOM_options_set (options, "count", "0");
-    ZOOM_options_set (options, "start", "0");
+        int error;
+        const char *errmsg, *addinfo, *dset;
+        /* display errors if any */
+        if (!c[i])
+            continue;
+        if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
+        {
+            printf("%s error: %s (%s:%d) %s\n",
+                   ZOOM_connection_option_get(c[i], "host"), errmsg,
+                   dset, error, addinfo);
+            ret = 1;
+        }
+        else if (r[i])
+        {
+            const char *suggestions = ZOOM_resultset_option_get(r[i], "suggestions");
+            if (suggestions) {
+                printf("Suggestions: \n%s\n", suggestions);
+            }
+        }
+    }
+    return ret;
 }
 
-static void cmd_ext (ZOOM_connection *c, ZOOM_resultset *r,
-                     ZOOM_options options,
-                     const char **args)
+
+static int cmd_ext(ZOOM_connection *c, ZOOM_resultset *r,
+                   ZOOM_options options,
+                   const char **args)
 {
     ZOOM_package p[MAX_CON];
-    char ext_type_str[10];
-    
     int i;
-
-    if (next_token_copy (args, ext_type_str, sizeof(ext_type_str)) < 0)
-	return;
+    int ret = 0;
+    WRBUF ext_type_str = next_token_new_wrbuf(args);
     
+    if (!ext_type_str)
+    {
+        printf("es: missing type "
+               "(itemorder, create, drop, commit, update, xmlupdate)\n");
+        return 1;
+    }
     for (i = 0; i<MAX_CON; i++)
     {
-	if (c[i])
+        if (c[i])
         {
-            p[i] = ZOOM_connection_package (c[i], 0);
-            ZOOM_package_send(p[i], ext_type_str);
+            p[i] = ZOOM_connection_package(c[i], 0);
+            ZOOM_package_send(p[i], ext_type_str ? wrbuf_cstr(ext_type_str):0);
         }
         else
             p[i] = 0;
     }
 
-    while (ZOOM_event (MAX_CON, c))
-	;
+    process_events(c);
 
     for (i = 0; i<MAX_CON; i++)
     {
-	int error;
-	const char *errmsg, *addinfo, *dset;
-	/* display errors if any */
-	if (!p[i])
-	    continue;
-	if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
-	    printf ("%s error: %s (%s:%d) %s\n",
-		     ZOOM_connection_option_get(c[i], "host"), errmsg,
-		     dset, error, addinfo);
-	else if (p[i])
-	{
-            printf ("ok\n");
-	}
-        ZOOM_package_destroy (p[i]);
+        int error;
+        const char *errmsg, *addinfo, *dset;
+        /* display errors if any */
+        if (!p[i])
+            continue;
+        if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
+        {
+            printf("%s error: %s (%s:%d) %s\n",
+                   ZOOM_connection_option_get(c[i], "host"), errmsg,
+                   dset, error, addinfo);
+            ret = 1;
+        }
+        else if (p[i])
+        {
+            const char *v;
+            printf("ok\n");
+            v = ZOOM_package_option_get(p[i], "targetReference");
+            if (v)
+                printf("targetReference: %s\n", v);
+            v = ZOOM_package_option_get(p[i], "xmlUpdateDoc");
+            if (v)
+                printf("xmlUpdateDoc: %s\n", v);
+        }
+        ZOOM_package_destroy(p[i]);
     }
+    if (ext_type_str)
+        wrbuf_destroy(ext_type_str);
+    return ret;
 }
 
-static void cmd_debug (ZOOM_connection *c, ZOOM_resultset *r,
-                       ZOOM_options options,
-                       const char **args)
+static int cmd_debug(ZOOM_connection *c, ZOOM_resultset *r,
+                     ZOOM_options options,
+                     const char **args)
 {
-    yaz_log_init_level(LOG_ALL);
+    yaz_log_init_level(YLOG_ALL);
+    return 0;
 }
 
-static void cmd_search (ZOOM_connection *c, ZOOM_resultset *r,
-			ZOOM_options options,
-			const char **args)
+static int cmd_search(ZOOM_connection *c, ZOOM_resultset *r,
+                      ZOOM_options options,
+                      const char **args)
 {
     ZOOM_query s;
     const char *query_str = *args;
     int i;
+    int ret = 0;
     
-    s = ZOOM_query_create ();
+    s = ZOOM_query_create();
     while (*query_str == ' ')
         query_str++;
     if (memcmp(query_str, "cql:", 4) == 0)
     {
-        ZOOM_query_cql (s, query_str + 4);
+        ZOOM_query_cql(s, query_str + 4);
     }
-    else if (ZOOM_query_prefix (s, query_str))
+    else if (ZOOM_query_prefix(s, query_str))
     {
-	printf ("Bad PQF: %s\n", query_str);
-	return;
+        printf("Bad PQF: %s\n", query_str);
+        ZOOM_query_destroy(s);
+        return 1;
     }
     for (i = 0; i<MAX_CON; i++)
     {
-	if (c[i])
-	{
-	    ZOOM_resultset_destroy (r[i]);
-	    r[i] = 0;
-	}
-	if (c[i])
-	    r[i] = ZOOM_connection_search (c[i], s);
+
+        if (c[i])
+        {
+            ZOOM_resultset_destroy(r[i]);
+            r[i] = 0;
+        }
+        if (c[i])
+            r[i] = ZOOM_connection_search(c[i], s);
     }
+    ZOOM_query_destroy(s);
 
-    while (ZOOM_event (MAX_CON, c))
-	;
+    process_events(c);
 
     for (i = 0; i<MAX_CON; i++)
     {
-	int error;
-	const char *errmsg, *addinfo, *dset;
-	/* display errors if any */
-	if (!c[i])
-	    continue;
-	if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
-	    printf ("%s error: %s (%s:%d) %s\n",
-		    ZOOM_connection_option_get(c[i], "host"), errmsg,
-		    dset, error, addinfo);
-	else if (r[i])
-	{
-	    /* OK, no major errors. Look at the result count */
-	    int start = ZOOM_options_get_int (options, "start", 0);
-	    int count = ZOOM_options_get_int (options, "count", 0);
-
-	    printf ("%s: %d hits\n", ZOOM_connection_option_get(c[i], "host"),
-		    ZOOM_resultset_size(r[i]));
-	    /* and display */
-	    display_records (c[i], r[i], start, count);
-	}
-    }
-    ZOOM_query_destroy (s);
+        int error;
+        const char *errmsg, *addinfo, *dset;
+        /* display errors if any */
+        if (!c[i])
+            continue;
+        if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
+        {
+            printf("%s error: %s (%s:%d) %s\n",
+                   ZOOM_connection_option_get(c[i], "host"), errmsg,
+                   dset, error, addinfo);
+            ret = 1;
+        }
+        else if (r[i])
+        {
+            /* OK, no major errors. Look at the result count */
+            int start = ZOOM_options_get_int(options, "start", 0);
+            int count = ZOOM_options_get_int(options, "count", 0);
+            int facet_num;
+
+            printf("%s: %lld hits\n", ZOOM_connection_option_get(c[i], "host"),
+                   (long long int) ZOOM_resultset_size(r[i]));
+            
+            facet_num = ZOOM_resultset_facets_size(r[i]);
+            if (facet_num)
+            {
+                ZOOM_facet_field *facets = ZOOM_resultset_facets(r[i]);
+                int facet_idx;
+                for (facet_idx = 0; facet_idx < facet_num; facet_idx++)
+                {
+                    const char *name = ZOOM_facet_field_name(facets[facet_idx]);
+                    size_t term_idx;
+                    size_t term_num = ZOOM_facet_field_term_count(facets[facet_idx]);
+                    printf("facet: %s\n", name);
+                    for (term_idx = 0; term_idx < term_num; term_idx++ )
+                    {
+                        int freq;
+                        const char *term =
+                            ZOOM_facet_field_get_term(facets[facet_idx], term_idx, &freq);
+                        printf("term: %s %d\n", term, freq);
+                    }
+                }
+            }
+            /* and display */
+            display_records(c[i], r[i], start, count, "render");
+        }
+    }
+    return ret;
 }
 
-static void cmd_scan (ZOOM_connection *c, ZOOM_resultset *r,
-                      ZOOM_options options,
-                      const char **args)
+static int cmd_scan(ZOOM_connection *c, ZOOM_resultset *r,
+                    ZOOM_options options,
+                    const char **args)
 {
-    const char *start_term = *args;
+    const char *query_str = *args;
+    ZOOM_query query = ZOOM_query_create();
     int i;
+    int ret = 0;
     ZOOM_scanset s[MAX_CON];
     
-    while (*start_term == ' ')
-        start_term++;
+    while (*query_str == ' ')
+        query_str++;
+
+    if (memcmp(query_str, "cql:", 4) == 0)
+    {
+        ZOOM_query_cql(query, query_str + 4);
+    }
+    else if (ZOOM_query_prefix(query, query_str))
+    {
+        printf("Bad PQF: %s\n", query_str);
+        ZOOM_query_destroy(query);
+        return 1;
+    }
 
     for (i = 0; i<MAX_CON; i++)
     {
         if (c[i])
-            s[i] = ZOOM_connection_scan(c[i], start_term);
+            s[i] = ZOOM_connection_scan1(c[i], query);
         else
             s[i] = 0;
     }
-    while (ZOOM_event(MAX_CON, c))
-        ;
+    ZOOM_query_destroy(query);
+
+    process_events(c);
+
     for (i = 0; i<MAX_CON; i++)
     {
-        if (s[i]) {
+        int error;
+        const char *errmsg, *addinfo, *dset;
+        /* display errors if any */
+        if (!c[i])
+            continue;
+        if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
+        {
+            printf("%s error: %s (%s:%d) %s\n",
+                   ZOOM_connection_option_get(c[i], "host"), errmsg,
+                   dset, error, addinfo);
+            ret = 1;
+        }
+        if (s[i])
+        {
             size_t p, sz = ZOOM_scanset_size(s[i]);
             for (p = 0; p < sz; p++)
             {
-                int occ = 0;
-                int len = 0;
+                size_t occ = 0;
+                size_t len = 0;
                 const char *term = ZOOM_scanset_display_term(s[i], p,
-				&occ, &len);
-                fwrite(term, 1, len, stdout);
-                printf (" %d\n", occ);
+                                                             &occ, &len);
+                printf("%.*s %lld\n", (int) len, term, (long long int) occ);
             }            
             ZOOM_scanset_destroy(s[i]);
         }
     }
+    return ret;
 }
 
-static void cmd_help (ZOOM_connection *c, ZOOM_resultset *r,
-		      ZOOM_options options,
-		      const char **args)
+static int cmd_sort(ZOOM_connection *c, ZOOM_resultset *r,
+                    ZOOM_options options,
+                    const char **args)
 {
-    printf ("connect <zurl>\n");
-    printf ("search <pqf>\n");
-    printf ("show [<start> [<count>]\n");
-    printf ("scan <term>\n");
-    printf ("quit\n");
-    printf ("close <zurl>\n");
-    printf ("set <option> [<value>]\n");
-    printf ("get <option>\n");
-    printf ("\n");
-    printf ("options:\n");
-    printf (" start\n");
-    printf (" count\n");
-    printf (" databaseName\n");
-    printf (" preferredRecordSyntax\n");
-    printf (" proxy\n");
-    printf (" elementSetName\n");
-    printf (" maximumRecordSize\n");
-    printf (" preferredRecordSize\n");
-    printf (" async\n");
-    printf (" piggyback\n");
-    printf (" group\n");
-    printf (" user\n");
-    printf (" pass\n");
-    printf (" implementationName\n");
-    printf (" charset\n");
-    printf (" lang\n");
+    const char *sort_spec = *args;
+    int i;
+    int ret = 0;
+    
+    while (*sort_spec == ' ')
+        sort_spec++;
+    
+    for (i = 0; i<MAX_CON; i++)
+    {
+        if (r[i])
+            ZOOM_resultset_sort(r[i], "yaz", sort_spec);
+    }
+    process_events(c);
+    return ret;
 }
 
-static void cmd_connect (ZOOM_connection *c, ZOOM_resultset *r,
-			 ZOOM_options options,
-			 const char **args)
+static int cmd_help(ZOOM_connection *c, ZOOM_resultset *r,
+                    ZOOM_options options,
+                    const char **args)
 {
+    printf("connect <zurl>\n");
+    printf("search <pqf>\n");
+    printf("show [<start> [<count> [<type]]]\n");
+    printf("facets\n");
+    printf("scan <term>\n");
+    printf("quit\n");
+    printf("close <zurl>\n");
+    printf("ext <type>\n");
+    printf("set <option> [<value>]\n");
+    printf("get <option>\n");
+    printf("\n");
+    printf("options:\n");
+    printf(" start\n");
+    printf(" count\n");
+    printf(" databaseName\n");
+    printf(" preferredRecordSyntax\n");
+    printf(" proxy\n");
+    printf(" elementSetName\n");
+    printf(" maximumRecordSize\n");
+    printf(" preferredRecordSize\n");
+    printf(" async\n");
+    printf(" piggyback\n");
+    printf(" group\n");
+    printf(" user\n");
+    printf(" password\n");
+    printf(" implementationName\n");
+    printf(" charset\n");
+    printf(" lang\n");
+    printf(" timeout\n");
+    printf(" facets\n");
+    printf(" extraArgs\n");
+    printf(" suggestions\n");
+    return 0;
+}
+
+static int cmd_connect(ZOOM_connection *c, ZOOM_resultset *r,
+                       ZOOM_options options,
+                       const char **args)
+{
+    int ret = 0;
     int error;
     const char *errmsg, *addinfo, *dset;
-    char host[60];
     int j, i;
-    if (next_token_copy (args, host, sizeof(host)) < 0)
+    WRBUF host = next_token_new_wrbuf(args);
+    if (!host)
     {
-	printf ("missing host after connect\n");
-	return ;
+        printf("missing host after connect\n");
+        return 1;
     }
     for (j = -1, i = 0; i<MAX_CON; i++)
     {
-	const char *h;
-	if (c[i] && (h = ZOOM_connection_option_get(c[i], "host")) &&
-	    !strcmp (h, host))
-	{
-	    ZOOM_connection_destroy (c[i]);
-	    break;
-	}
-	else if (c[i] == 0 && j == -1)
-	    j = i;
+        const char *h;
+        if (c[i] && (h = ZOOM_connection_option_get(c[i], "host")) &&
+            !strcmp(h, wrbuf_cstr(host)))
+        {
+            ZOOM_connection_destroy(c[i]);
+            break;
+        }
+        else if (c[i] == 0 && j == -1)
+            j = i;
     }
     if (i == MAX_CON)  /* no match .. */
     {
-	if (j == -1)
-	{
-	    printf ("no more connection available\n");
-	    return;
-	}
-	i = j;   /* OK, use this one is available */
+        if (j == -1)
+        {
+            printf("no more connection available\n");
+            wrbuf_destroy(host);
+            return 1;
+        }
+        i = j;   /* OK, use this one is available */
     }
-    c[i] = ZOOM_connection_create (options);
-    ZOOM_connection_connect (c[i], host, 0);
-	
+    c[i] = ZOOM_connection_create(options);
+    ZOOM_connection_connect(c[i], wrbuf_cstr(host), 0);
+        
     if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
-       printf ("%s error: %s (%s:%d) %s\n",
-	    ZOOM_connection_option_get(c[i], "host"), errmsg,
-	    dset, error, addinfo);
+    {
+        printf("%s error: %s (%s:%d) %s\n",
+               ZOOM_connection_option_get(c[i], "host"), errmsg,
+               dset, error, addinfo);
+        ret = 1;
+    }
+    wrbuf_destroy(host);
+    return ret;
 }
 
-static int cmd_parse (ZOOM_connection *c, ZOOM_resultset *r,
-		      ZOOM_options options, 
-		      const char **buf)
+/** \brief parse and execute zoomsh command
+    \param c connections
+    \param r result sets
+    \param options ZOOM options
+    \param buf command string and arguments
+    \retval 0 OK
+    \retval 1 failure to execute
+    \retval -1 EOF (no more commands or quit seen)
+*/
+static int cmd_parse(ZOOM_connection *c, ZOOM_resultset *r,
+                     ZOOM_options options, 
+                     const char **buf)
 {
     int cmd_len;
     const char *cmd_str;
+    int ret = 0;
 
-    cmd_len = next_token (buf, &cmd_str);
+    cmd_len = next_token(buf, &cmd_str);
     if (cmd_len < 0)
-	return 1;
-    if (is_command ("quit", cmd_str, cmd_len))
-	return 0;
-    else if (is_command ("set", cmd_str, cmd_len))
-	cmd_set (c, r, options, buf);
-    else if (is_command ("get", cmd_str, cmd_len))
-	cmd_get (c, r, options, buf);
-    else if (is_command ("connect", cmd_str, cmd_len))
-	cmd_connect (c, r, options, buf);
-    else if (is_command ("open", cmd_str, cmd_len))
-	cmd_connect (c, r, options, buf);
-    else if (is_command ("search", cmd_str, cmd_len))
-	cmd_search (c, r, options, buf);
-    else if (is_command ("find", cmd_str, cmd_len))
-	cmd_search (c, r, options, buf);
-    else if (is_command ("show", cmd_str, cmd_len))
-	cmd_show (c, r, options, buf);
-    else if (is_command ("close", cmd_str, cmd_len))
-	cmd_close (c, r, options, buf);
-    else if (is_command ("help", cmd_str, cmd_len))
-	cmd_help(c, r, options, buf);
-    else if (is_command ("ext", cmd_str, cmd_len))
-	cmd_ext(c, r, options, buf);
-    else if (is_command ("debug", cmd_str, cmd_len))
-	cmd_debug(c, r, options, buf);
-    else if (is_command ("scan", cmd_str, cmd_len))
-	cmd_scan(c, r, options, buf);
+        return -1;
+    if (is_command("quit", cmd_str, cmd_len))
+        return -1;
+    else if (is_command("set", cmd_str, cmd_len))
+        ret = cmd_set(c, r, options, buf);
+    else if (is_command("get", cmd_str, cmd_len))
+        ret = cmd_get(c, r, options, buf);
+    else if (is_command("rget", cmd_str, cmd_len))
+        ret = cmd_rget(c, r, options, buf);
+    else if (is_command("connect", cmd_str, cmd_len))
+        ret = cmd_connect(c, r, options, buf);
+    else if (is_command("open", cmd_str, cmd_len))
+        ret = cmd_connect(c, r, options, buf);
+    else if (is_command("search", cmd_str, cmd_len))
+        ret = cmd_search(c, r, options, buf);
+    else if (is_command("facets", cmd_str, cmd_len))
+        ret = cmd_facets(c, r, options, buf);
+    else if (is_command("find", cmd_str, cmd_len))
+        ret = cmd_search(c, r, options, buf);
+    else if (is_command("show", cmd_str, cmd_len))
+        ret = cmd_show(c, r, options, buf);
+    else if (is_command("suggestions", cmd_str, cmd_len))
+        ret = cmd_suggestions(c, r, options, buf);
+    else if (is_command("close", cmd_str, cmd_len))
+        ret = cmd_close(c, r, options, buf);
+    else if (is_command("help", cmd_str, cmd_len))
+        ret = cmd_help(c, r, options, buf);
+    else if (is_command("ext", cmd_str, cmd_len))
+        ret = cmd_ext(c, r, options, buf);
+    else if (is_command("debug", cmd_str, cmd_len))
+        ret = cmd_debug(c, r, options, buf);
+    else if (is_command("scan", cmd_str, cmd_len))
+        ret = cmd_scan(c, r, options, buf);
+    else if (is_command("sort", cmd_str, cmd_len))
+        ret = cmd_sort(c, r, options, buf);
     else
-	printf ("unknown command %.*s\n", cmd_len, cmd_str);
-    return 2;
+    {
+        printf("unknown command %.*s\n", cmd_len, cmd_str);
+        ret = 1;
+    }
+    return ret;
 }
 
-void shell(ZOOM_connection *c, ZOOM_resultset *r,
-           ZOOM_options options)
+static int shell(ZOOM_connection *c, ZOOM_resultset *r,
+                 ZOOM_options options, int exit_on_error)
 {
-    while (1)
+    int res = 0;
+    while (res == 0)
     {
-        char buf[1000];
-	char *cp;
-	const char *bp = buf;
+        char buf[100000];
+        char *cp;
+        const char *bp = buf;
 #if HAVE_READLINE_READLINE_H
-	char* line_in;
-	line_in=readline("ZOOM>");
-	if (!line_in)
-	    break;
+        char* line_in;
+        line_in = readline("ZOOM>");
+        if (!line_in)
+        {
+            res = -1;
+            break;
+        }
 #if HAVE_READLINE_HISTORY_H
-	if (*line_in)
-	    add_history(line_in);
+        if (*line_in)
+            add_history(line_in);
 #endif
-	if(strlen(line_in) > 999) {
-	    printf("Input line too long\n");
-	    break;
-	};
-	strcpy(buf,line_in);
-	free (line_in);
+        if (strlen(line_in) > sizeof(buf)-1)
+        {
+            printf("Input line too long\n");
+            res = 1;
+            break;
+        }
+        strcpy(buf,line_in);
+        free(line_in);
 #else    
-	printf ("ZOOM>"); fflush (stdout);
-	if (!fgets (buf, 999, stdin))
-	    break;
+        printf("ZOOM>"); fflush(stdout);
+        if (!fgets(buf, sizeof(buf)-1, stdin))
+        {
+            res = -1;
+            break;
+        }
 #endif 
-	if ((cp = strchr(buf, '\n')))
-	    *cp = '\0';
-	if (!cmd_parse (c, r, options, &bp))
-	    break;
+        if ((cp = strchr(buf, '\n')))
+            *cp = '\0';
+        res = cmd_parse(c, r, options, &bp);
+        if (res == -1)
+            break;
+        if (!exit_on_error && res > 0)
+            res = 0;
     }
+    return res;
 }
 
-int main (int argc, char **argv)
+static int zoomsh(int argc, char **argv)
 {
-    ZOOM_options options = ZOOM_options_create();
-    int i, res;
+    ZOOM_options zoom_options = ZOOM_options_create();
+    int i, res = 0; /* -1: EOF; 0 = OK, > 0 ERROR */
+    int exit_on_error = 0;
     ZOOM_connection z39_con[MAX_CON];
     ZOOM_resultset  z39_res[MAX_CON];
 
-    nmem_init();
     for (i = 0; i<MAX_CON; i++)
     {
-	z39_con[i] = 0;
-	z39_res[i] = 0;
+        z39_con[i] = 0;
+        z39_res[i] = 0;
     }
-
-    for (i = 0; i<MAX_CON; i++)
-	z39_con[i] = 0;
-
-    res = 1;
-    for (i = 1; i<argc; i++)
+    while (res == 0)
     {
-	const char *bp = argv[i];
-	res = cmd_parse(z39_con, z39_res, options, &bp);
-	if (res == 0)  /* received quit */
-	    break;
+        int mask;
+        char *arg = 0;
+        int option_ret = options("ev:", argv, argc, &arg);
+        const char *bp = arg;
+        switch (option_ret)
+        {
+        case 0:
+            res = cmd_parse(z39_con, z39_res, zoom_options, &bp);
+            /* returns res == -1 on quit */
+            if (!exit_on_error && res > 0)
+                res = 0;  /* hide error */
+            break;
+        case YAZ_OPTIONS_EOF:
+            res = shell(z39_con, z39_res, zoom_options, exit_on_error);
+            break;
+        case 'e':
+            exit_on_error = 1;
+            break;
+        case 'v':
+            mask = yaz_log_mask_str(arg);
+            yaz_log_init_level(mask);
+            break;
+        default:
+            fprintf(stderr, "zoomsh: [-e] [-v] [commands]\n");
+            res = 1;
+        }
     }
-    if (res)  /* do cmdline shell only if not quitting */
-	shell(z39_con, z39_res, options);
-    ZOOM_options_destroy(options);
 
     for (i = 0; i<MAX_CON; i++)
     {
-	ZOOM_connection_destroy(z39_con[i]);
-	ZOOM_resultset_destroy(z39_res[i]);
+        ZOOM_connection_destroy(z39_con[i]);
+        ZOOM_resultset_destroy(z39_res[i]);
     }
-    nmem_exit();
-    exit (0);
+    ZOOM_options_destroy(zoom_options);
+    if (res == -1) /* quit .. which is not an error */
+        res = 0;
+    return res;
+}
+
+int main(int argc, char **argv)
+{
+    int ret = zoomsh(argc, argv);
+    exit(ret);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+