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 c6b29ae..6f37182 100644 (file)
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,14 +1,19 @@
 /*
- * $Id: zoomsh.c,v 1.22 2003-07-10 11:50:32 mike 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,7 +23,7 @@
 
 #include <yaz/xmalloc.h>
 
-#include <yaz/log.h>
+#include <yaz/ylog.h>
 #include <yaz/nmem.h>
 #include <yaz/zoom.h>
 #include <yaz/oid.h>
@@ -153,8 +158,9 @@ 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)
@@ -166,7 +172,10 @@ static void display_records (ZOOM_connection c,
            if (render)
                fwrite (render, 1, len, stdout);
            printf ("\n");
+           if (opac_render)
+               fwrite (opac_render, 1, opac_len, stdout);
        }
+           
     }
 }
 
@@ -216,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;
@@ -256,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,
@@ -347,7 +360,8 @@ static void cmd_scan (ZOOM_connection *c, ZOOM_resultset *r,
             {
                 int occ = 0;
                 int len = 0;
-                const char *term = ZOOM_scanset_term(s[i], p, &occ, &len);
+                const char *term = ZOOM_scanset_display_term(s[i], p,
+                               &occ, &len);
                 fwrite(term, 1, len, stdout);
                 printf (" %d\n", occ);
             }            
@@ -356,6 +370,25 @@ static void cmd_scan (ZOOM_connection *c, ZOOM_resultset *r,
     }
 }
 
+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)
@@ -382,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");
@@ -467,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;