X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zoom%2Fzoomsh.c;h=702b09dbecd785bf8e27e79eee6ee2bcd7d68060;hb=17144b85fb59bb8e0bdf1f8f634c339d88baf069;hp=a770e7db786f3f98d9c2509cf1e1224865a896dd;hpb=ba1a707a2125e63c7180d712f4b8bf3685a17105;p=yaz-moved-to-github.git diff --git a/zoom/zoomsh.c b/zoom/zoomsh.c index a770e7d..702b09d 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 @@ -29,12 +31,12 @@ static void process_events(ZOOM_connection *c) { int i; - printf("process_events\n"); + 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]); - printf ("no = %d peek = %d event = %d %s\n", i-1, + yaz_log(YLOG_DEBUG, "no = %d peek = %d event = %d %s", i-1, peek, event, ZOOM_get_event_str(event)); @@ -467,13 +469,33 @@ static void cmd_search(ZOOM_connection *c, ZOOM_resultset *r, /* OK, no major errors. Look at the result count */ int start = ZOOM_options_get_int(options, "start", 0); int count = ZOOM_options_get_int(options, "count", 0); + int facet_num; printf("%s: %lld hits\n", ZOOM_connection_option_get(c[i], "host"), (long long int) ZOOM_resultset_size(r[i])); -#if 0 + + facet_num = ZOOM_resultset_facets_size(r[i]); + if (facet_num) + { + ZOOM_facet_field *facets = ZOOM_resultset_facets(r[i]); + int facet_idx; + for (facet_idx = 0; facet_idx < facet_num; facet_idx++) + { + const char *name = ZOOM_facet_field_name(facets[facet_idx]); + size_t term_idx; + size_t term_num = ZOOM_facet_field_term_count(facets[facet_idx]); + printf("facet: %s\n", name); + for (term_idx = 0; term_idx < term_num; term_idx++ ) + { + int freq; + const char *term = + ZOOM_facet_field_get_term(facets[facet_idx], term_idx, &freq); + printf("term: %s %d\n", term, freq); + } + } + } /* and display */ display_records(c[i], r[i], start, count, "render"); -#endif } } }