/* 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 <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <yaz/wrbuf.h>
+#include <yaz/log.h>
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
#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;
else
{
*t_start = cp;
- while (*cp && *cp != ' ' && *cp != '\r' && *cp != '\n')
+ while (*cp && !strchr(tok_chars, *cp))
{
cp++;
len++;
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;
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 != -1)
+ ZOOM_options_setl(options, wrbuf_cstr(key), val_buf, val_len);
else
ZOOM_options_set(options, wrbuf_cstr(key), 0);
wrbuf_destroy(key);
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++)
{
const char **args)
{
int i;
- size_t start = 0, count = 1;
- const char *type = "render";
- WRBUF render_str = 0;
-
- if (0)
- {
- WRBUF tmp;
-
- if ((tmp = next_token_new_wrbuf(args)))
- {
- start = atoi(wrbuf_cstr(tmp));
- wrbuf_destroy(tmp);
- }
- if ((tmp = next_token_new_wrbuf(args)))
- {
- count = atoi(wrbuf_cstr(tmp));
- wrbuf_destroy(tmp);
- }
- render_str = next_token_new_wrbuf(args);
- }
- if (render_str)
- type = wrbuf_cstr(render_str);
-
- /*
- for (i = 0; i < MAX_CON; i++) {
- int num_facets = ZOOM_resultset_facet_size(r[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++)
{
}
}
}
- if (render_str)
- wrbuf_destroy(render_str);
-
}
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<MAX_CON; i++)
{
}
ZOOM_query_destroy(s);
- while (ZOOM_event(MAX_CON, c))
- ;
+ process_events(c);
for (i = 0; i<MAX_CON; i++)
{
/* 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]));
+
+ 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");
}
}
ZOOM_query_destroy(query);
- while (ZOOM_event(MAX_CON, c))
- ;
+ process_events(c);
+
for (i = 0; i<MAX_CON; i++)
{
int error;
if (r[i])
ZOOM_resultset_sort(r[i], "yaz", sort_spec);
}
- while (ZOOM_event(MAX_CON, c))
- ;
+ process_events(c);
}
static void cmd_help(ZOOM_connection *c, ZOOM_resultset *r,