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

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 9115bf3..26aab7b 100644
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2012 Index Data
  * See the file LICENSE for details.
  */
 /** \file zoomsh.c
@@ -14,6 +14,7 @@
 #include <string.h>
 #include <yaz/wrbuf.h>
 #include <yaz/log.h>
+#include <yaz/options.h>
 
 #if HAVE_READLINE_READLINE_H
 #include <readline/readline.h> 
@@ -43,7 +44,8 @@ static void process_events(ZOOM_connection *c)
     }
 }
 
-static int next_token(const char **cpp, const char **t_start)
+static int next_token_chars(const char **cpp, const char **t_start,
+                            const char *tok_chars)
 {
     int len = 0;
     const char *cp = *cpp;
@@ -64,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++;
@@ -76,6 +78,12 @@ static int next_token(const char **cpp, const char **t_start)
     return len;  /* return -1 if no token was read .. */
 }
 
+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;
@@ -99,35 +107,37 @@ static int is_command(const char *cmd_str, const char *this_str, int this_len)
     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)
 {
-    WRBUF key, val;
+    WRBUF key;
+    const char *val_buf;
+    int val_len;
 
     if (!(key = next_token_new_wrbuf(args)))
     {
         printf("missing argument for set\n");
-        return ;
-    }
-    if ((val = next_token_new_wrbuf(args)))
-    {
-        ZOOM_options_set(options, wrbuf_cstr(key), wrbuf_cstr(val));
-        wrbuf_destroy(val);
+        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;
 }
 
-static void cmd_get(ZOOM_connection *c, ZOOM_resultset *r,
-                    ZOOM_options options,
-                    const char **args)
+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 get\n");
+        return 1;
     }
     else
     {
@@ -135,16 +145,18 @@ static void cmd_get(ZOOM_connection *c, ZOOM_resultset *r,
         printf("%s = %s\n", wrbuf_cstr(key), val ? val : "<null>");
         wrbuf_destroy(key);
     }
+    return 0;
 }
 
-static void cmd_rget(ZOOM_connection *c, ZOOM_resultset *r,
-                     ZOOM_options options,
+static int cmd_rget(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 get\n");
+        return 1;
     }
     else
     {
@@ -160,11 +172,12 @@ static void cmd_rget(ZOOM_connection *c, ZOOM_resultset *r,
         }
         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)
 {
     WRBUF host;
     int i;
@@ -188,6 +201,7 @@ static void cmd_close(ZOOM_connection *c, ZOOM_resultset *r,
     }
     if (host)
         wrbuf_destroy(host);
+    return 0;
 }
 
 static void display_records(ZOOM_connection c,
@@ -237,14 +251,15 @@ static void display_records(ZOOM_connection c,
     }
 }
 
-static void cmd_show(ZOOM_connection *c, ZOOM_resultset *r,
-                     ZOOM_options options,
-                     const char **args)
+static int cmd_show(ZOOM_connection *c, ZOOM_resultset *r,
+                    ZOOM_options options,
+                    const char **args)
 {
     int i;
     size_t start = 0, count = 1;
     const char *type = "render";
     WRBUF render_str = 0;
+    int ret = 0;
 
     {
         WRBUF tmp;
@@ -277,9 +292,12 @@ static void cmd_show(ZOOM_connection *c, ZOOM_resultset *r,
         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... */
@@ -288,7 +306,7 @@ static void cmd_show(ZOOM_connection *c, ZOOM_resultset *r,
     }
     if (render_str)
         wrbuf_destroy(render_str);
-       
+    return ret;
 }
 
 static void display_facets(ZOOM_facet_field *facets, int count) {
@@ -306,11 +324,12 @@ static void display_facets(ZOOM_facet_field *facets, int count) {
     }
 }
 
-static void cmd_facets(ZOOM_connection *c, ZOOM_resultset *r,
-                     ZOOM_options options,
-                     const char **args)
+static int cmd_facets(ZOOM_connection *c, ZOOM_resultset *r,
+                      ZOOM_options options,
+                      const char **args)
 {
     int i;
+    int ret = 0;
 
     process_events(c);
 
@@ -322,9 +341,12 @@ static void cmd_facets(ZOOM_connection *c, ZOOM_resultset *r,
         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]);
@@ -334,16 +356,57 @@ static void cmd_facets(ZOOM_connection *c, ZOOM_resultset *r,
             }
         }
     }
+    return ret;
 }
 
-static void cmd_ext(ZOOM_connection *c, ZOOM_resultset *r,
-                    ZOOM_options options,
-                    const char **args)
+static int cmd_suggestions(ZOOM_connection *c, ZOOM_resultset *r, ZOOM_options options, const char **args)
+{
+    int i;
+    int ret = 0;
+
+    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])
+        {
+            const char *suggestions = ZOOM_resultset_option_get(r[i], "suggestions");
+            if (suggestions) {
+                printf("Suggestions: \n%s\n", suggestions);
+            }
+        }
+    }
+    return ret;
+}
+
+
+static int cmd_ext(ZOOM_connection *c, ZOOM_resultset *r,
+                   ZOOM_options options,
+                   const char **args)
 {
     ZOOM_package p[MAX_CON];
     int i;
+    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])
@@ -365,9 +428,12 @@ static void cmd_ext(ZOOM_connection *c, ZOOM_resultset *r,
         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;
@@ -383,22 +449,25 @@ static void cmd_ext(ZOOM_connection *c, ZOOM_resultset *r,
     }
     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(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();
     while (*query_str == ' ')
@@ -410,7 +479,8 @@ static void cmd_search(ZOOM_connection *c, ZOOM_resultset *r,
     else if (ZOOM_query_prefix(s, query_str))
     {
         printf("Bad PQF: %s\n", query_str);
-        return;
+        ZOOM_query_destroy(s);
+        return 1;
     }
     for (i = 0; i<MAX_CON; i++)
     {
@@ -435,9 +505,12 @@ static void cmd_search(ZOOM_connection *c, ZOOM_resultset *r,
         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 */
@@ -472,15 +545,17 @@ static void cmd_search(ZOOM_connection *c, ZOOM_resultset *r,
             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 *query_str = *args;
     ZOOM_query query = ZOOM_query_create();
     int i;
+    int ret = 0;
     ZOOM_scanset s[MAX_CON];
     
     while (*query_str == ' ')
@@ -493,7 +568,8 @@ static void cmd_scan(ZOOM_connection *c, ZOOM_resultset *r,
     else if (ZOOM_query_prefix(query, query_str))
     {
         printf("Bad PQF: %s\n", query_str);
-        return;
+        ZOOM_query_destroy(query);
+        return 1;
     }
 
     for (i = 0; i<MAX_CON; i++)
@@ -515,11 +591,14 @@ static void cmd_scan(ZOOM_connection *c, ZOOM_resultset *r,
         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);
-
-        if (s[i]) {
+            ret = 1;
+        }
+        if (s[i])
+        {
             size_t p, sz = ZOOM_scanset_size(s[i]);
             for (p = 0; p < sz; p++)
             {
@@ -532,14 +611,16 @@ static void cmd_scan(ZOOM_connection *c, ZOOM_resultset *r,
             ZOOM_scanset_destroy(s[i]);
         }
     }
+    return ret;
 }
 
-static void cmd_sort(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)
 {
     const char *sort_spec = *args;
     int i;
+    int ret = 0;
     
     while (*sort_spec == ' ')
         sort_spec++;
@@ -550,11 +631,12 @@ static void cmd_sort(ZOOM_connection *c, ZOOM_resultset *r,
             ZOOM_resultset_sort(r[i], "yaz", sort_spec);
     }
     process_events(c);
+    return ret;
 }
 
-static void cmd_help(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");
@@ -586,12 +668,16 @@ static void cmd_help(ZOOM_connection *c, ZOOM_resultset *r,
     printf(" lang\n");
     printf(" timeout\n");
     printf(" facets\n");
+    printf(" extraArgs\n");
+    printf(" suggestions\n");
+    return 0;
 }
 
-static void cmd_connect(ZOOM_connection *c, ZOOM_resultset *r,
-                        ZOOM_options options,
-                        const char **args)
+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;
     int j, i;
@@ -599,7 +685,7 @@ static void cmd_connect(ZOOM_connection *c, ZOOM_resultset *r,
     if (!host)
     {
         printf("missing host after connect\n");
-        return ;
+        return 1;
     }
     for (j = -1, i = 0; i<MAX_CON; i++)
     {
@@ -619,7 +705,7 @@ static void cmd_connect(ZOOM_connection *c, ZOOM_resultset *r,
         {
             printf("no more connection available\n");
             wrbuf_destroy(host);
-            return;
+            return 1;
         }
         i = j;   /* OK, use this one is available */
     }
@@ -627,98 +713,131 @@ static void cmd_connect(ZOOM_connection *c, ZOOM_resultset *r,
     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);
+        ret = 1;
+    }
     wrbuf_destroy(host);
+    return ret;
 }
 
+/** \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);
     if (cmd_len < 0)
-        return 1;
+        return -1;
     if (is_command("quit", cmd_str, cmd_len))
-        return 0;
+        return -1;
     else if (is_command("set", cmd_str, cmd_len))
-        cmd_set(c, r, options, buf);
+        ret = cmd_set(c, r, options, buf);
     else if (is_command("get", cmd_str, cmd_len))
-        cmd_get(c, r, options, buf);
+        ret = cmd_get(c, r, options, buf);
     else if (is_command("rget", cmd_str, cmd_len))
-        cmd_rget(c, r, options, buf);
+        ret = cmd_rget(c, r, options, buf);
     else if (is_command("connect", cmd_str, cmd_len))
-        cmd_connect(c, r, options, buf);
+        ret = cmd_connect(c, r, options, buf);
     else if (is_command("open", cmd_str, cmd_len))
-        cmd_connect(c, r, options, buf);
+        ret = cmd_connect(c, r, options, buf);
     else if (is_command("search", cmd_str, cmd_len))
-        cmd_search(c, r, options, buf);
+        ret = cmd_search(c, r, options, buf);
     else if (is_command("facets", cmd_str, cmd_len))
-        cmd_facets(c, r, options, buf);
+        ret = cmd_facets(c, r, options, buf);
     else if (is_command("find", cmd_str, cmd_len))
-        cmd_search(c, r, options, buf);
+        ret = cmd_search(c, r, options, buf);
     else if (is_command("show", cmd_str, cmd_len))
-        cmd_show(c, r, options, buf);
+        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))
-        cmd_close(c, r, options, buf);
+        ret = cmd_close(c, r, options, buf);
     else if (is_command("help", cmd_str, cmd_len))
-        cmd_help(c, r, options, buf);
+        ret = cmd_help(c, r, options, buf);
     else if (is_command("ext", cmd_str, cmd_len))
-        cmd_ext(c, r, options, buf);
+        ret = cmd_ext(c, r, options, buf);
     else if (is_command("debug", cmd_str, cmd_len))
-        cmd_debug(c, r, options, buf);
+        ret = cmd_debug(c, r, options, buf);
     else if (is_command("scan", cmd_str, cmd_len))
-        cmd_scan(c, r, options, buf);
+        ret = cmd_scan(c, r, options, buf);
     else if (is_command("sort", cmd_str, cmd_len))
-        cmd_sort(c, r, options, buf);
+        ret = cmd_sort(c, r, options, buf);
     else
+    {
         printf("unknown command %.*s\n", cmd_len, cmd_str);
-    return 2;
+        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 buf[100000];
         char *cp;
         const char *bp = buf;
 #if HAVE_READLINE_READLINE_H
         char* line_in;
-        line_in=readline("ZOOM>");
+        line_in = readline("ZOOM>");
         if (!line_in)
+        {
+            res = -1;
             break;
+        }
 #if HAVE_READLINE_HISTORY_H
         if (*line_in)
             add_history(line_in);
 #endif
-        if(strlen(line_in) > 999) {
+        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))
+        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))
+        res = cmd_parse(c, r, options, &bp);
+        if (res == -1)
             break;
+        if (!exit_on_error && res > 0)
+            res = 0;
     }
+    return res;
 }
 
-static void zoomsh(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];
 
@@ -727,51 +846,51 @@ static void zoomsh(int argc, char **argv)
         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 */
+        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_options_destroy(zoom_options);
+    if (res == -1) /* quit .. which is not an error */
+        res = 0;
+    return res;
 }
 
 int main(int argc, char **argv)
 {
-    const char *maskstr = 0;
-    if (argc > 2 && !strcmp(argv[1], "-v"))
-    {
-        maskstr = argv[2];
-        argv += 2;
-        argc -= 2;
-    }
-    else if (argc > 1 && !strncmp(argv[1], "-v", 2))
-    {
-        maskstr = argv[1]+2;
-        argv++;
-        argc--;
-    }
-    if (maskstr)
-    {
-        int mask = yaz_log_mask_str(maskstr);
-        yaz_log_init_level(mask);
-    }
-    zoomsh(argc, argv);
-    exit(0);
+    int ret = zoomsh(argc, argv);
+    exit(ret);
 }
 /*
  * Local variables: