/*
- * $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
*/
#include <yaz/xmalloc.h>
+#include <yaz/log.h>
#include <yaz/zoom.h>
#define MAX_CON 100
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])
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])
}
}
+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)
}
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++)
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 */
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)))
}
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,
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;
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);
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;
ZOOM_connection_destroy(z39_con[i]);
ZOOM_resultset_destroy(z39_res[i]);
}
+ nmem_exit();
exit (0);
}