X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=37b487b94a5d7f734b199b7c9534c7f811f23942;hb=2a8b6ee438067fd3cc2f85685b727d726136bfb8;hp=80970661384f7a25f519e2c8b53875f966dc9f17;hpb=d9d97a04b6f9597225b8440dad61790dfa39a751;p=yaz-moved-to-github.git

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 8097066..37b487b 100644
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoomsh.c,v 1.14 2003-02-17 14:35:42 adam Exp $
+ * $Id: zoomsh.c,v 1.18 2003-03-03 19:57:36 adam Exp $
  *
  * ZOOM-C Shell
  */
@@ -18,6 +18,8 @@
 
 #include <yaz/xmalloc.h>
 
+#include <yaz/log.h>
+#include <yaz/nmem.h>
 #include <yaz/zoom.h>
 
 #define MAX_CON 100
@@ -184,6 +186,8 @@ static void cmd_show (ZOOM_connection *c, ZOOM_resultset *r,
 	    display_records (c[i], r[i], start, count);
 	}
     }
+    ZOOM_options_set (options, "count", "0");
+    ZOOM_options_set (options, "start", "0");
 }
 
 static void cmd_ext (ZOOM_connection *c, ZOOM_resultset *r,
@@ -227,6 +231,13 @@ static void cmd_ext (ZOOM_connection *c, ZOOM_resultset *r,
     }
 }
 
+static void cmd_debug (ZOOM_connection *c, ZOOM_resultset *r,
+                       ZOOM_options options,
+                       const char **args)
+{
+    yaz_log_init_level(LOG_ALL);
+}
+
 static void cmd_search (ZOOM_connection *c, ZOOM_resultset *r,
 			ZOOM_options options,
 			const char **args)
@@ -287,6 +298,43 @@ static void cmd_search (ZOOM_connection *c, ZOOM_resultset *r,
     ZOOM_query_destroy (s);
 }
 
+static void cmd_scan (ZOOM_connection *c, ZOOM_resultset *r,
+                      ZOOM_options options,
+                      const char **args)
+{
+    const char *start_term = *args;
+    int i;
+    ZOOM_scanset s[MAX_CON];
+    
+    while (*start_term == ' ')
+        start_term++;
+
+    for (i = 0; i<MAX_CON; i++)
+    {
+        if (c[i])
+            s[i] = ZOOM_connection_scan(c[i], start_term);
+        else
+            s[i] = 0;
+    }
+    while (ZOOM_event(MAX_CON, c))
+        ;
+    for (i = 0; i<MAX_CON; i++)
+    {
+        if (s[i]) {
+            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);
+                fwrite(term, 1, len, stdout);
+                printf (" %d\n", occ);
+            }            
+            ZOOM_scanset_destroy(s[i]);
+        }
+    }
+}
+
 static void cmd_help (ZOOM_connection *c, ZOOM_resultset *r,
 		      ZOOM_options options,
 		      const char **args)
@@ -294,6 +342,7 @@ static void cmd_help (ZOOM_connection *c, ZOOM_resultset *r,
     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");
@@ -393,6 +442,10 @@ static int cmd_parse (ZOOM_connection *c, ZOOM_resultset *r,
 	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);
     else
 	printf ("unknown command %.*s\n", cmd_len, cmd_str);
     return 2;
@@ -440,9 +493,7 @@ int main (int argc, char **argv)
     ZOOM_connection z39_con[MAX_CON];
     ZOOM_resultset  z39_res[MAX_CON];
 
-#if 0
-    yaz_log_init_level(65535);
-#endif
+    nmem_init();
     for (i = 0; i<MAX_CON; i++)
     {
 	z39_con[i] = 0;
@@ -469,5 +520,6 @@ int main (int argc, char **argv)
 	ZOOM_connection_destroy(z39_con[i]);
 	ZOOM_resultset_destroy(z39_res[i]);
     }
+    nmem_exit();
     exit (0);
 }