#include <string.h>
#include <ctype.h>
-#include <yaz/comstack.h>
-
#if HAVE_READLINE_READLINE_H
#include <readline/readline.h>
#endif
#include <readline/history.h>
#endif
-#include <yaz/xmalloc.h>
-
#include <yaz/log.h>
-#include <yaz/nmem.h>
#include <yaz/zoom.h>
#define MAX_CON 100
static void display_records(ZOOM_connection c,
ZOOM_resultset r,
- int start, int count)
+ int start, int count, const char *type)
{
int i;
for (i = 0; i<count; i++)
else
{
int len, opac_len;
- const char *render = ZOOM_record_get(rec, "render", &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);
const char **args)
{
int i;
- char start_str[10], count_str[10];
+ char start_str[10], count_str[10], render_str[60];
+ const char *type = "render";
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)) >= 0)
- ZOOM_options_set(options, "count", count_str);
+ if (next_token_copy(args, count_str, sizeof(count_str)) <= 0)
+ strcpy(count_str, "1");
+ ZOOM_options_set(options, "count", count_str);
+
+ if (next_token_copy(args, render_str, sizeof(render_str)) >= 0)
+ type = render_str;
for (i = 0; i<MAX_CON; i++)
ZOOM_resultset_records(r[i], 0, atoi(start_str), atoi(count_str));
/* OK, no major errors. Display records... */
int start = ZOOM_options_get_int(options, "start", 0);
int count = ZOOM_options_get_int(options, "count", 0);
- display_records(c[i], r[i], start, count);
+ display_records(c[i], r[i], start, count, type);
}
}
ZOOM_options_set(options, "count", "0");
int start = ZOOM_options_get_int(options, "start", 0);
int count = ZOOM_options_get_int(options, "count", 0);
- printf("%s: %ld hits\n", ZOOM_connection_option_get(c[i], "host"),
- (long) ZOOM_resultset_size(r[i]));
+ printf("%s: %lld hits\n", ZOOM_connection_option_get(c[i], "host"),
+ (long long int) ZOOM_resultset_size(r[i]));
/* and display */
- display_records(c[i], r[i], start, count);
+ display_records(c[i], r[i], start, count, "render");
}
}
}
size_t p, sz = ZOOM_scanset_size(s[i]);
for (p = 0; p < sz; p++)
{
- int occ = 0;
- int len = 0;
+ size_t occ = 0;
+ size_t len = 0;
const char *term = ZOOM_scanset_display_term(s[i], p,
&occ, &len);
-
- printf("%.*s %d\n", len, term, occ);
+ printf("%.*s %lld\n", (int) len, term, (long long int) occ);
}
ZOOM_scanset_destroy(s[i]);
}