X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=81c8d7d3273d37bac6e24787023b09163ab75c78;hp=601dafc28965561ba93cf7996788cf78f5a72597;hb=d94ffff6dcab70517a1588747bd76c6afc694a65;hpb=43a39e3fad856932e6f538bb05781d0430c58899

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 601dafc..81c8d7d 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-2013 Index Data
  * See the file LICENSE for details.
  */
 /** \file zoomsh.c
@@ -17,7 +17,7 @@
 #include <yaz/options.h>
 
 #if HAVE_READLINE_READLINE_H
-#include <readline/readline.h> 
+#include <readline/readline.h>
 #endif
 #if HAVE_READLINE_HISTORY_H
 #include <readline/history.h>
@@ -148,6 +148,15 @@ static int cmd_get(ZOOM_connection *c, ZOOM_resultset *r,
     return 0;
 }
 
+static int cmd_shell(ZOOM_connection *c, ZOOM_resultset *r,
+                     ZOOM_options options, const char **args)
+{
+    int ret = system(*args);
+    if (ret)
+         printf("system command returned %d\n", ret);
+    return 0;
+}
+
 static int cmd_rget(ZOOM_connection *c, ZOOM_resultset *r,
                     ZOOM_options options,
                      const char **args)
@@ -166,7 +175,7 @@ static int cmd_rget(ZOOM_connection *c, ZOOM_resultset *r,
             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>");
         }
@@ -214,14 +223,14 @@ static void display_records(ZOOM_connection c,
         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");
@@ -400,7 +409,13 @@ static int cmd_ext(ZOOM_connection *c, ZOOM_resultset *r,
     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])
@@ -462,7 +477,7 @@ static int cmd_search(ZOOM_connection *c, ZOOM_resultset *r,
     const char *query_str = *args;
     int i;
     int ret = 0;
-    
+
     s = ZOOM_query_create();
     while (*query_str == ' ')
         query_str++;
@@ -514,7 +529,7 @@ static int cmd_search(ZOOM_connection *c, ZOOM_resultset *r,
 
             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)
             {
@@ -551,7 +566,7 @@ static int cmd_scan(ZOOM_connection *c, ZOOM_resultset *r,
     int i;
     int ret = 0;
     ZOOM_scanset s[MAX_CON];
-    
+
     while (*query_str == ' ')
         query_str++;
 
@@ -601,7 +616,7 @@ static int cmd_scan(ZOOM_connection *c, ZOOM_resultset *r,
                 const char *term = ZOOM_scanset_display_term(s[i], p,
                                                              &occ, &len);
                 printf("%.*s %lld\n", (int) len, term, (long long int) occ);
-            }            
+            }
             ZOOM_scanset_destroy(s[i]);
         }
     }
@@ -615,10 +630,10 @@ static int cmd_sort(ZOOM_connection *c, ZOOM_resultset *r,
     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])
@@ -642,6 +657,7 @@ static int cmd_help(ZOOM_connection *c, ZOOM_resultset *r,
     printf("ext <type>\n");
     printf("set <option> [<value>]\n");
     printf("get <option>\n");
+    printf("shell cmdline\n");
     printf("\n");
     printf("options:\n");
     printf(" start\n");
@@ -705,7 +721,7 @@ static int cmd_connect(ZOOM_connection *c, ZOOM_resultset *r,
     }
     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",
@@ -727,7 +743,7 @@ static int cmd_connect(ZOOM_connection *c, ZOOM_resultset *r,
     \retval -1 EOF (no more commands or quit seen)
 */
 static int cmd_parse(ZOOM_connection *c, ZOOM_resultset *r,
-                     ZOOM_options options, 
+                     ZOOM_options options,
                      const char **buf)
 {
     int cmd_len;
@@ -771,6 +787,8 @@ static int cmd_parse(ZOOM_connection *c, ZOOM_resultset *r,
         ret = cmd_scan(c, r, options, buf);
     else if (is_command("sort", cmd_str, cmd_len))
         ret = cmd_sort(c, r, options, buf);
+    else if (is_command("shell", cmd_str, cmd_len))
+        ret = cmd_shell(c, r, options, buf);
     else
     {
         printf("unknown command %.*s\n", cmd_len, cmd_str);
@@ -785,7 +803,7 @@ static int shell(ZOOM_connection *c, ZOOM_resultset *r,
     int res = 0;
     while (res == 0)
     {
-        char buf[1000];
+        char buf[100000];
         char *cp;
         const char *bp = buf;
 #if HAVE_READLINE_READLINE_H
@@ -800,7 +818,7 @@ static int shell(ZOOM_connection *c, ZOOM_resultset *r,
         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;
@@ -808,14 +826,14 @@ static int shell(ZOOM_connection *c, ZOOM_resultset *r,
         }
         strcpy(buf,line_in);
         free(line_in);
-#else    
+#else
         printf("ZOOM>"); fflush(stdout);
-        if (!fgets(buf, 999, stdin))
+        if (!fgets(buf, sizeof(buf)-1, stdin))
         {
             res = -1;
             break;
         }
-#endif 
+#endif
         if ((cp = strchr(buf, '\n')))
             *cp = '\0';
         res = cmd_parse(c, r, options, &bp);