/*
- * $Id: zoomsh.c,v 1.9 2002-05-18 09:52:37 oleg Exp $
+ * $Id: zoomsh.c,v 1.14 2003-02-17 14:35:42 adam Exp $
*
* ZOOM-C Shell
*/
return ;
}
if (!next_token_copy (args, val, sizeof(val)))
+ ZOOM_options_set(options, key, 0);
+ else
+ ZOOM_options_set(options, key, val);
+}
+
+static void cmd_get (ZOOM_connection *c, ZOOM_resultset *r,
+ ZOOM_options options,
+ const char **args)
+{
+ char key[40];
+ if (!next_token_copy (args, key, sizeof(key)))
{
- const char *val = ZOOM_options_get(options, key);
- printf ("%s = %s\n", key, val ? val : "<null>");
+ printf ("missing argument for get\n");
}
else
- ZOOM_options_set(options, key, val);
+ {
+ const char *val = ZOOM_options_get(options, key);
+ printf ("%s = %s\n", key, val ? val : "<null>");
+ }
}
static void cmd_close (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... */
}
}
+static void cmd_ext (ZOOM_connection *c, ZOOM_resultset *r,
+ ZOOM_options options,
+ const char **args)
+{
+ ZOOM_package p[MAX_CON];
+
+ int i;
+
+ for (i = 0; i<MAX_CON; i++)
+ {
+ if (c[i])
+ {
+ p[i] = ZOOM_connection_package (c[i], 0);
+ ZOOM_package_send(p[i], "itemorder");
+ }
+ else
+ p[i] = 0;
+ }
+
+ while (ZOOM_event (MAX_CON, c))
+ ;
+
+ for (i = 0; i<MAX_CON; i++)
+ {
+ int error;
+ const char *errmsg, *addinfo, *dset;
+ /* display errors if any */
+ if (!p[i])
+ continue;
+ 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 (p[i])
+ {
+ printf ("ok\n");
+ }
+ ZOOM_package_destroy (p[i]);
+ }
+}
+
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)
+ {
+ ZOOM_query_cql (s, query_str + 4);
+ }
+ else if (ZOOM_query_prefix (s, query_str))
{
- fprintf (stderr, "Bad PQF: %s\n", *args);
+ printf ("Bad PQF: %s\n", query_str);
return;
}
for (i = 0; i<MAX_CON; i++)
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 */
printf ("show [<start> [<count>]\n");
printf ("quit\n");
printf ("close <zurl>\n");
- printf ("set <option> [<value>]]\n");
+ printf ("set <option> [<value>]\n");
+ printf ("get <option>\n");
printf ("\n");
printf ("options:\n");
printf (" start\n");
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,
return 0;
else if (is_command ("set", cmd_str, cmd_len))
cmd_set (c, r, options, buf);
+ else if (is_command ("get", cmd_str, cmd_len))
+ cmd_get (c, r, options, buf);
else if (is_command ("connect", cmd_str, cmd_len))
cmd_connect (c, r, options, buf);
+ else if (is_command ("open", cmd_str, cmd_len))
+ cmd_connect (c, r, options, buf);
else if (is_command ("search", cmd_str, cmd_len))
cmd_search (c, r, options, buf);
+ else if (is_command ("find", cmd_str, cmd_len))
+ cmd_search (c, r, options, buf);
else if (is_command ("show", cmd_str, cmd_len))
cmd_show (c, r, options, buf);
else if (is_command ("close", cmd_str, cmd_len))
cmd_close (c, r, options, buf);
else if (is_command ("help", cmd_str, cmd_len))
cmd_help(c, r, options, buf);
+ else if (is_command ("ext", cmd_str, cmd_len))
+ cmd_ext(c, r, options, buf);
else
printf ("unknown command %.*s\n", cmd_len, cmd_str);
return 2;
}
-void shell(ZOOM_connection *c, ZOOM_resultset *r, ZOOM_options options)
+void shell(ZOOM_connection *c, ZOOM_resultset *r,
+ ZOOM_options options)
{
while (1)
{
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);
int i, res;
ZOOM_connection z39_con[MAX_CON];
ZOOM_resultset z39_res[MAX_CON];
+
+#if 0
+ yaz_log_init_level(65535);
+#endif
for (i = 0; i<MAX_CON; i++)
{
z39_con[i] = 0;
projects / yaz-moved-to-github.git / blobdiff