X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=fea218104c880d9007626b47812230082f5a5dbf;hb=4c2a1989cfcdeba0338fce5fe9152a37837ef28a;hp=466633e1533e3f597260a7159d70d4a0657adf16;hpb=1958bfea3355304f47bd6dd2cc20b58b8c4b0f3e;p=yaz-moved-to-github.git diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c index 466633e..fea2181 100644 --- a/zoom/zoomsh.c +++ b/zoom/zoomsh.c @@ -1,17 +1,19 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. */ - /** \file zoomsh.c \brief ZOOM C command line tool (shell) */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include -#include #include +#include #if HAVE_READLINE_READLINE_H #include @@ -25,7 +27,24 @@ #define MAX_CON 100 -static int next_token(const char **cpp, const char **t_start) +static void process_events(ZOOM_connection *c) +{ + int i; + + yaz_log(YLOG_DEBUG, "process_events"); + while ((i = ZOOM_event(MAX_CON, c)) != 0) + { + int peek = ZOOM_connection_peek_event(c[i-1]); + int event = ZOOM_connection_last_event(c[i-1]); + yaz_log(YLOG_DEBUG, "no = %d peek = %d event = %d %s", i-1, + peek, + event, + ZOOM_get_event_str(event)); + } +} + +static int next_token_chars(const char **cpp, const char **t_start, + const char *tok_chars) { int len = 0; const char *cp = *cpp; @@ -46,7 +65,7 @@ static int next_token(const char **cpp, const char **t_start) else { *t_start = cp; - while (*cp && *cp != ' ' && *cp != '\r' && *cp != '\n') + while (*cp && !strchr(tok_chars, *cp)) { cp++; len++; @@ -58,6 +77,12 @@ static int next_token(const char **cpp, const char **t_start) return len; /* return -1 if no token was read .. */ } +static int next_token(const char **cpp, const char **t_start) +{ + return next_token_chars(cpp, t_start, "\r\n "); +} + + static WRBUF next_token_new_wrbuf(const char **cpp) { WRBUF w = 0; @@ -85,18 +110,18 @@ static void cmd_set(ZOOM_connection *c, ZOOM_resultset *r, ZOOM_options options, const char **args) { - WRBUF key, val; + WRBUF key; + const char *val_buf; + int val_len; if (!(key = next_token_new_wrbuf(args))) { printf("missing argument for set\n"); return ; } - if ((val = next_token_new_wrbuf(args))) - { - ZOOM_options_set(options, wrbuf_cstr(key), wrbuf_cstr(val)); - wrbuf_destroy(val); - } + val_len = next_token_chars(args, &val_buf, ""); + if (val_len) + ZOOM_options_setl(options, wrbuf_cstr(key), val_buf, val_len); else ZOOM_options_set(options, wrbuf_cstr(key), 0); wrbuf_destroy(key); @@ -196,9 +221,8 @@ static void display_records(ZOOM_connection c, } else { - int len, opac_len; + int len; const char *render = ZOOM_record_get(rec, type, &len); - const char *opac_render = ZOOM_record_get(rec, "opac", &opac_len); const char *syntax = ZOOM_record_get(rec, "syntax", 0); const char *schema = ZOOM_record_get(rec, "schema", 0); /* if rec is non-null, we got a record for display */ @@ -215,12 +239,6 @@ static void display_records(ZOOM_connection c, } } printf("\n"); - if (opac_render) - { - if (fwrite(opac_render, 1, opac_len, stdout) != (size_t) - opac_len) - printf("write to stdout failed\n"); - } } } } @@ -256,8 +274,7 @@ static void cmd_show(ZOOM_connection *c, ZOOM_resultset *r, for (i = 0; i < MAX_CON; i++) ZOOM_resultset_records(r[i], 0, start, count); - while (ZOOM_event(MAX_CON, c)) - ; + process_events(c); for (i = 0; i < MAX_CON; i++) { @@ -281,6 +298,51 @@ static void cmd_show(ZOOM_connection *c, ZOOM_resultset *r, } +static void display_facets(ZOOM_facet_field *facets, int count) { + int index; + printf("Facets: \n"); + for (index = 0; index < count; index++) { + int term_index; + const char *facet_name = ZOOM_facet_field_name(facets[index]); + printf(" %s: \n", facet_name); + for (term_index = 0; term_index < ZOOM_facet_field_term_count(facets[index]); term_index++) { + int freq = 0; + const char *term = ZOOM_facet_field_get_term(facets[index], term_index, &freq); + printf(" %s(%d) \n", term, freq); + } + } +} + +static void cmd_facets(ZOOM_connection *c, ZOOM_resultset *r, + ZOOM_options options, + const char **args) +{ + int i; + + process_events(c); + + for (i = 0; i < MAX_CON; i++) + { + int error; + const char *errmsg, *addinfo, *dset; + /* display errors if any */ + if (!c[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 (r[i]) + { + int num_facets = ZOOM_resultset_facets_size(r[i]); + if (num_facets) { + ZOOM_facet_field *facets = ZOOM_resultset_facets(r[i]); + display_facets(facets, num_facets); + } + } + } +} + static void cmd_ext(ZOOM_connection *c, ZOOM_resultset *r, ZOOM_options options, const char **args) @@ -300,8 +362,7 @@ static void cmd_ext(ZOOM_connection *c, ZOOM_resultset *r, p[i] = 0; } - while (ZOOM_event(MAX_CON, c)) - ; + process_events(c); for (i = 0; i\n"); printf("search \n"); printf("show [ [ [\n"); printf("quit\n"); printf("close \n"); @@ -510,6 +592,7 @@ static void cmd_help(ZOOM_connection *c, ZOOM_resultset *r, printf(" charset\n"); printf(" lang\n"); printf(" timeout\n"); + printf(" facets\n"); } static void cmd_connect(ZOOM_connection *c, ZOOM_resultset *r, @@ -581,6 +664,8 @@ static int cmd_parse(ZOOM_connection *c, ZOOM_resultset *r, 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("facets", cmd_str, cmd_len)) + cmd_facets(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))