/*
- * $Id: zoomsh.c,v 1.8 2002-02-20 14:40:42 adam Exp $
+ * $Id: zoomsh.c,v 1.21 2003-07-09 23:00:21 mike Exp $
*
* ZOOM-C Shell
*/
#include <yaz/xmalloc.h>
+#include <yaz/log.h>
+#include <yaz/nmem.h>
#include <yaz/zoom.h>
+#include <yaz/oid.h>
#define MAX_CON 100
const char *cp = *cpp;
while (*cp == ' ')
cp++;
- *t_start = cp;
- while (*cp && *cp != ' ' && *cp != '\r' && *cp != '\n')
+ if (*cp == '"')
{
- cp++;
- len++;
+ cp++;
+ *t_start = cp;
+ while (*cp && *cp != '"')
+ {
+ cp++;
+ len++;
+ }
+ if (*cp)
+ cp++;
+ }
+ else
+ {
+ *t_start = cp;
+ while (*cp && *cp != ' ' && *cp != '\r' && *cp != '\n')
+ {
+ cp++;
+ len++;
+ }
+ if (len == 0)
+ len = -1;
}
*cpp = cp;
- return len;
+ return len; /* return -1 if no token was read .. */
}
static int next_token_copy (const char **cpp, char *buf_out, int buf_max)
{
const char *start;
int len = next_token (cpp, &start);
- if (!len)
+ if (len < 0)
{
*buf_out = 0;
- return 0;
+ return len;
}
if (len >= buf_max)
len = buf_max-1;
{
char key[40], val[80];
- if (!next_token_copy (args, key, sizeof(key)))
+ if (next_token_copy (args, key, sizeof(key)) < 0)
{
printf ("missing argument for set\n");
return ;
}
- if (!next_token_copy (args, val, sizeof(val)))
+ if (next_token_copy (args, val, sizeof(val)) < 0)
+ 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)) < 0)
{
- 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,
}
}
+static const char *oid_name_to_dotstring(const char *name) {
+ struct oident ent;
+ int oid[OID_SIZE];
+ static char oidbuf[100]; /* ### bad interface */
+ int i;
+
+ /* Translate syntax to oid_val */
+ oid_value value = oid_getvalbyname(name);
+
+ /* Build it into an oident */
+ ent.proto = PROTO_Z3950;
+ ent.oclass = CLASS_RECSYN;
+ ent.value = value;
+
+ /* Translate to an array of int */
+ (void) oid_ent_to_oid(&ent, oid);
+
+ /* Write the array of int into a dotted string (phew!) */
+ oidbuf[0] = '\0';
+ for (i = 0; oid[i] != -1; i++) {
+ char tmpbuf[20];
+ sprintf(tmpbuf, "%d", oid[i]);
+ if (i > 0) strcat(oidbuf, ".");
+ strcat(oidbuf, tmpbuf);
+ }
+
+ return oidbuf;
+}
+
static void display_records (ZOOM_connection c,
ZOOM_resultset r,
int start, int count)
/* if rec is non-null, we got a record for display */
if (rec)
{
- printf ("%d %s %s\n", pos+1, (db ? db : "unknown"), syntax);
+ const char *syntax_oid = oid_name_to_dotstring(syntax);
+ printf ("%d %s %s (%s)\n",
+ pos+1, (db ? db : "unknown"), syntax, syntax_oid);
if (render)
fwrite (render, 1, len, stdout);
printf ("\n");
int i;
char start_str[10], count_str[10];
- if (next_token_copy (args, start_str, sizeof(start_str)))
+ if (next_token_copy (args, start_str, sizeof(start_str)) >= 0)
ZOOM_options_set (options, "start", start_str);
- if (next_token_copy (args, count_str, sizeof(count_str)))
+ if (next_token_copy (args, count_str, sizeof(count_str)) >= 0)
ZOOM_options_set (options, "count", count_str);
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",
+ 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... */
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,
+ 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_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,
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 */
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;
+ int 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)
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");
+ printf ("set <option> [<value>]\n");
+ printf ("get <option>\n");
printf ("\n");
printf ("options:\n");
printf (" start\n");
printf (" user\n");
printf (" pass\n");
printf (" implementationName\n");
+ printf (" charset\n");
+ printf (" lang\n");
}
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)))
+ if (next_token_copy (args, host, sizeof(host)) < 0)
{
printf ("missing host after connect\n");
return ;
}
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,
const char *cmd_str;
cmd_len = next_token (buf, &cmd_str);
- if (!cmd_len)
+ if (cmd_len < 0)
return 1;
if (is_command ("quit", cmd_str, cmd_len))
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 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;
}
-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];
+
+ 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);
}
projects / yaz-moved-to-github.git / blobdiff