X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=37b487b94a5d7f734b199b7c9534c7f811f23942;hb=1e5554fc59c8cad2105b2a8cf095d13315dc6ed1;hp=6aedbd06dcadcfca1501e73ec947edaaa33dea50;hpb=c9c53d8b79a1d6283dcc446ed3f1292a4522a49c;p=yaz-moved-to-github.git

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index 6aedbd0..37b487b 100644
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoomsh.c,v 1.11 2002-06-05 21:09:20 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
@@ -168,14 +170,14 @@ static void cmd_show (ZOOM_connection *c, ZOOM_resultset *r,
     for (i = 0; i<MAX_CON; i++)
     {
 	int error;
-	const char *errmsg, *addinfo;
+	const char *errmsg, *addinfo, *dset;
 	/* display errors if any */
 	if (!c[i])
 	    continue;
-	if ((error = ZOOM_connection_error(c[i], &errmsg, &addinfo)))
-	    fprintf (stderr, "%s error: %s (%d) %s\n",
+	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,
-		     error, addinfo);
+		     dset, error, addinfo);
 	else if (r[i])
 	{
 	    /* OK, no major errors. Display records... */
@@ -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,
@@ -211,14 +215,14 @@ static void cmd_ext (ZOOM_connection *c, ZOOM_resultset *r,
     for (i = 0; i<MAX_CON; i++)
     {
 	int error;
-	const char *errmsg, *addinfo;
+	const char *errmsg, *addinfo, *dset;
 	/* display errors if any */
 	if (!p[i])
 	    continue;
-	if ((error = ZOOM_connection_error(c[i], &errmsg, &addinfo)))
-	    fprintf (stderr, "%s error: %s (%d) %s\n",
+	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,
-		     error, addinfo);
+		     dset, error, addinfo);
 	else if (p[i])
 	{
             printf ("ok\n");
@@ -227,17 +231,31 @@ 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)
 {
     ZOOM_query s;
+    const char *query_str = *args;
     int i;
     
     s = ZOOM_query_create ();
-    if (ZOOM_query_prefix (s, *args))
+    while (*query_str == ' ')
+        query_str++;
+    if (memcmp(query_str, "cql:", 4) == 0)
     {
-	fprintf (stderr, "Bad PQF: %s\n", *args);
+        ZOOM_query_cql (s, query_str + 4);
+    }
+    else if (ZOOM_query_prefix (s, query_str))
+    {
+	printf ("Bad PQF: %s\n", query_str);
 	return;
     }
     for (i = 0; i<MAX_CON; i++)
@@ -257,14 +275,14 @@ static void cmd_search (ZOOM_connection *c, ZOOM_resultset *r,
     for (i = 0; i<MAX_CON; i++)
     {
 	int error;
-	const char *errmsg, *addinfo;
+	const char *errmsg, *addinfo, *dset;
 	/* display errors if any */
 	if (!c[i])
 	    continue;
-	if ((error = ZOOM_connection_error(c[i], &errmsg, &addinfo)))
-	    fprintf (stderr, "%s error: %s (%d) %s\n",
-		     ZOOM_connection_option_get(c[i], "host"), errmsg,
-		     error, addinfo);
+	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);
 	else if (r[i])
 	{
 	    /* OK, no major errors. Look at the result count */
@@ -280,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)
@@ -287,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");
@@ -316,7 +372,7 @@ static void cmd_connect (ZOOM_connection *c, ZOOM_resultset *r,
 			 const char **args)
 {
     int error;
-    const char *errmsg, *addinfo;
+    const char *errmsg, *addinfo, *dset;
     char host[60];
     int j, i;
     if (!next_token_copy (args, host, sizeof(host)))
@@ -347,12 +403,11 @@ static void cmd_connect (ZOOM_connection *c, ZOOM_resultset *r,
     }
     c[i] = ZOOM_connection_create (options);
     ZOOM_connection_connect (c[i], host, 0);
-
-    if ((error = ZOOM_connection_error(c[i], &errmsg, &addinfo)))
-	printf ("%s error: %s (%d) %s\n",
-                ZOOM_connection_option_get(c[i], "host"),
-		errmsg, error, addinfo);
-    
+	
+    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);
 }
 
 static int cmd_parse (ZOOM_connection *c, ZOOM_resultset *r,
@@ -387,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;
@@ -410,7 +469,7 @@ void shell(ZOOM_connection *c, ZOOM_resultset *r,
 	    add_history(line_in);
 #endif
 	if(strlen(line_in) > 999) {
-	    fprintf(stderr,"Input line too long\n");
+	    printf("Input line too long\n");
 	    break;
 	};
 	strcpy(buf,line_in);
@@ -433,6 +492,8 @@ int main (int argc, char **argv)
     int i, res;
     ZOOM_connection z39_con[MAX_CON];
     ZOOM_resultset  z39_res[MAX_CON];
+
+    nmem_init();
     for (i = 0; i<MAX_CON; i++)
     {
 	z39_con[i] = 0;
@@ -459,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);
 }