Deprecated log.h and created a new ylog.h

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

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 270942b..6f37182 100644 (file)
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,14 +1,19 @@
 /*
- * $Id: zoomsh.c,v 1.17 2003-02-24 13:14:49 adam Exp $
+ * Copyright (c) 2002-2004, Index Data.
+ * See the file LICENSE for details.
  *
- * ZOOM-C Shell
+ * $Id: zoomsh.c,v 1.30 2004-11-18 15:18:14 heikki Exp $
  */
 
+/* ZOOM-C Shell */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
+#include <yaz/comstack.h>
+
 #if HAVE_READLINE_READLINE_H
 #include <readline/readline.h> 
 #endif
@@ -18,8 +23,10 @@
 
 #include <yaz/xmalloc.h>
 
-#include <yaz/log.h>
+#include <yaz/ylog.h>
+#include <yaz/nmem.h>
 #include <yaz/zoom.h>
+#include <yaz/oid.h>
 
 #define MAX_CON 100
 
@@ -29,24 +36,41 @@ static int next_token (const char **cpp, const char **t_start)
     const char *cp = *cpp;
     while (*cp == ' ')
        cp++;
-    *t_start = cp;
-    while (*cp && *cp != ' ' && *cp != '\r' && *cp != '\n')
+    if (*cp == '"')
     {
-       cp++;
-       len++;
+        cp++;
+        *t_start = cp;
+        while (*cp && *cp != '"')
+        {
+            cp++;
+            len++;
+        }
+        if (*cp)
+            cp++;
+    }
+    else
+    {
+        *t_start = cp;
+        while (*cp && *cp != ' ' && *cp != '\r' && *cp != '\n')
+        {
+            cp++;
+            len++;
+        }
+        if (len == 0)
+            len = -1;
     }
     *cpp = cp;
-    return len;
+    return len;  /* return -1 if no token was read .. */
 }
 
 static int next_token_copy (const char **cpp, char *buf_out, int buf_max)
 {
     const char *start;
     int len = next_token (cpp, &start);
-    if (!len)
+    if (len < 0)
     {
        *buf_out = 0;
-       return 0;
+       return len;
     }
     if (len >= buf_max)
        len = buf_max-1;
@@ -71,12 +95,12 @@ static void cmd_set (ZOOM_connection *c, ZOOM_resultset *r,
 {
     char key[40], val[80];
 
-    if (!next_token_copy (args, key, sizeof(key)))
+    if (next_token_copy (args, key, sizeof(key)) < 0)
     {
        printf ("missing argument for set\n");
        return ;
     }
-    if (!next_token_copy (args, val, sizeof(val)))
+    if (next_token_copy (args, val, sizeof(val)) < 0)
        ZOOM_options_set(options, key, 0);
     else
        ZOOM_options_set(options, key, val);
@@ -87,7 +111,7 @@ static void cmd_get (ZOOM_connection *c, ZOOM_resultset *r,
                     const char **args)
 {
     char key[40];
-    if (!next_token_copy (args, key, sizeof(key)))
+    if (next_token_copy (args, key, sizeof(key)) < 0)
     {
        printf ("missing argument for get\n");
     }
@@ -134,17 +158,24 @@ static void display_records (ZOOM_connection c,
        int pos = i + start;
         ZOOM_record rec = ZOOM_resultset_record (r, pos);
        const char *db = ZOOM_record_get (rec, "database", 0);
-       int len;
+       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)
        {
-           printf ("%d %s %s\n", pos+1, (db ? db : "unknown"), syntax);
+           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);
        }
+           
     }
 }
 
@@ -155,10 +186,10 @@ static void cmd_show (ZOOM_connection *c, ZOOM_resultset *r,
     int i;
     char start_str[10], count_str[10];
 
-    if (next_token_copy (args, start_str, sizeof(start_str)))
+    if (next_token_copy (args, start_str, sizeof(start_str)) >= 0)
        ZOOM_options_set (options, "start", start_str);
 
-    if (next_token_copy (args, count_str, sizeof(count_str)))
+    if (next_token_copy (args, count_str, sizeof(count_str)) >= 0)
        ZOOM_options_set (options, "count", count_str);
 
     for (i = 0; i<MAX_CON; i++)
@@ -194,15 +225,19 @@ static void cmd_ext (ZOOM_connection *c, ZOOM_resultset *r,
                      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;
     
     for (i = 0; i<MAX_CON; i++)
     {
        if (c[i])
         {
             p[i] = ZOOM_connection_package (c[i], 0);
-            ZOOM_package_send(p[i], "itemorder");
+            ZOOM_package_send(p[i], ext_type_str);
         }
         else
             p[i] = 0;
@@ -234,7 +269,7 @@ static void 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);
 }
 
 static void cmd_search (ZOOM_connection *c, ZOOM_resultset *r,
@@ -323,16 +358,37 @@ static void cmd_scan (ZOOM_connection *c, ZOOM_resultset *r,
             size_t p, sz = ZOOM_scanset_size(s[i]);
             for (p = 0; p < sz; p++)
             {
-                int  occ = 0;
-                size_t len = 0;
-                const char *term = ZOOM_scanset_term(s[i], p, &occ, &len);
-                printf ("%.*s %d\n", len, term, occ);
+                int occ = 0;
+                int len = 0;
+                const char *term = ZOOM_scanset_display_term(s[i], p,
+                               &occ, &len);
+                fwrite(term, 1, len, stdout);
+                printf (" %d\n", occ);
             }            
             ZOOM_scanset_destroy(s[i]);
         }
     }
 }
 
+static void cmd_sort (ZOOM_connection *c, ZOOM_resultset *r,
+                      ZOOM_options options,
+                      const char **args)
+{
+    const char *sort_spec = *args;
+    int i;
+    
+    while (*sort_spec == ' ')
+        sort_spec++;
+    
+    for (i = 0; i<MAX_CON; i++)
+    {
+        if (r[i])
+            ZOOM_resultset_sort(r[i], "yaz", sort_spec);
+    }
+    while (ZOOM_event(MAX_CON, c))
+        ;
+}
+
 static void cmd_help (ZOOM_connection *c, ZOOM_resultset *r,
                      ZOOM_options options,
                      const char **args)
@@ -359,7 +415,7 @@ static void cmd_help (ZOOM_connection *c, ZOOM_resultset *r,
     printf (" piggyback\n");
     printf (" group\n");
     printf (" user\n");
-    printf (" pass\n");
+    printf (" password\n");
     printf (" implementationName\n");
     printf (" charset\n");
     printf (" lang\n");
@@ -373,7 +429,7 @@ static void cmd_connect (ZOOM_connection *c, ZOOM_resultset *r,
     const char *errmsg, *addinfo, *dset;
     char host[60];
     int j, i;
-    if (!next_token_copy (args, host, sizeof(host)))
+    if (next_token_copy (args, host, sizeof(host)) < 0)
     {
        printf ("missing host after connect\n");
        return ;
@@ -416,7 +472,7 @@ static int cmd_parse (ZOOM_connection *c, ZOOM_resultset *r,
     const char *cmd_str;
 
     cmd_len = next_token (buf, &cmd_str);
-    if (!cmd_len)
+    if (cmd_len < 0)
        return 1;
     if (is_command ("quit", cmd_str, cmd_len))
        return 0;
@@ -444,6 +500,8 @@ static int cmd_parse (ZOOM_connection *c, ZOOM_resultset *r,
        cmd_debug(c, r, options, buf);
     else if (is_command ("scan", cmd_str, cmd_len))
        cmd_scan(c, r, options, buf);
+    else if (is_command ("sort", cmd_str, cmd_len))
+       cmd_sort(c, r, options, buf);
     else
        printf ("unknown command %.*s\n", cmd_len, cmd_str);
     return 2;