X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=fb538f36c96526a2f670342b0c41b50e8d19d6d5;hp=cd0ab0ea762be41a387a6bb06a7c9a7a3dd0fb6d;hb=db585d7fcb8319fa86543eb062df7fdaf16858c6;hpb=ac286ae76051058c8e340bf84eb98391340b7d22

diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c
index cd0ab0e..fb538f3 100644
--- a/zoom/zoomsh.c
+++ b/zoom/zoomsh.c
@@ -1,5 +1,5 @@
 /*
- * $Id: zoomsh.c,v 1.13 2003-02-14 18:49:24 adam Exp $
+ * $Id: zoomsh.c,v 1.15 2003-02-17 21:23:31 adam Exp $
  *
  * ZOOM-C Shell
  */
@@ -18,6 +18,7 @@
 
 #include <yaz/xmalloc.h>
 
+#include <yaz/log.h>
 #include <yaz/zoom.h>
 
 #define MAX_CON 100
@@ -173,7 +174,7 @@ static void cmd_show (ZOOM_connection *c, ZOOM_resultset *r,
 	if (!c[i])
 	    continue;
 	if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
-	    fprintf (stderr, "%s error: %s (%s:%d) %s\n",
+	    printf ("%s error: %s (%s:%d) %s\n",
 		     ZOOM_connection_option_get(c[i], "host"), errmsg,
 		     dset, error, addinfo);
 	else if (r[i])
@@ -216,7 +217,7 @@ static void cmd_ext (ZOOM_connection *c, ZOOM_resultset *r,
 	if (!p[i])
 	    continue;
 	if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
-	    fprintf (stderr, "%s error: %s (%s:%d) %s\n",
+	    printf ("%s error: %s (%s:%d) %s\n",
 		     ZOOM_connection_option_get(c[i], "host"), errmsg,
 		     dset, error, addinfo);
 	else if (p[i])
@@ -227,6 +228,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)
@@ -244,7 +252,7 @@ static void cmd_search (ZOOM_connection *c, ZOOM_resultset *r,
     }
     else if (ZOOM_query_prefix (s, query_str))
     {
-	fprintf (stderr, "Bad PQF: %s\n", query_str);
+	printf ("Bad PQF: %s\n", query_str);
 	return;
     }
     for (i = 0; i<MAX_CON; i++)
@@ -269,9 +277,9 @@ static void cmd_search (ZOOM_connection *c, ZOOM_resultset *r,
 	if (!c[i])
 	    continue;
 	if ((error = ZOOM_connection_error_x(c[i], &errmsg, &addinfo, &dset)))
-	    fprintf (stderr, "%s error: %s (%s:%d) %s\n",
-		     ZOOM_connection_option_get(c[i], "host"), errmsg,
-		     dset, error, addinfo);
+	    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 */
@@ -323,7 +331,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)))
@@ -354,12 +362,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,
@@ -394,6 +401,8 @@ 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
 	printf ("unknown command %.*s\n", cmd_len, cmd_str);
     return 2;
@@ -417,7 +426,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);
@@ -441,6 +450,7 @@ int main (int argc, char **argv)
     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;
@@ -467,5 +477,6 @@ int main (int argc, char **argv)
 	ZOOM_connection_destroy(z39_con[i]);
 	ZOOM_resultset_destroy(z39_res[i]);
     }
+    nmem_exit();
     exit (0);
 }