/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2010 Index Data
* See the file LICENSE for details.
*/
/** \file client.c
static int scan_position = 1;
static int scan_size = 20;
static char cur_host[200];
-static int last_hit_count = 0;
+static Odr_int last_hit_count = 0;
typedef enum {
QueryType_Prefix,
return 1;
}
-static void print_stringn(const unsigned char *buf, size_t len)
+static void print_stringn(const char *buf, size_t len)
{
size_t i;
- for (i = 0; i<len; i++)
+ for (i = 0; i < len; i++)
if ((buf[i] <= 126 && buf[i] >= 32) || strchr("\n\r\t\f", buf[i]))
printf("%c", buf[i]);
else
- printf("\\X%02X", buf[i]);
+ printf("\\X%02X", ((const unsigned char *)buf)[i]);
}
static void print_refid(Z_ReferenceId *id)
if (id)
{
printf("Reference Id: ");
- print_stringn(id->buf, id->len);
+ print_stringn((const char *) id->buf, id->len);
printf("\n");
}
}
/* SEARCH SERVICE ------------------------------ */
static void display_record(Z_External *r);
-static void print_record(const unsigned char *buf, size_t len)
+static void print_record(const char *buf, size_t len)
{
size_t i = len;
print_stringn(buf, len);
}
}
}
- if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_soif))
+ if (oid && r->which == Z_External_octet)
{
- print_record((const unsigned char *) r->u.octet_aligned->buf,
- r->u.octet_aligned->len);
- marc_file_write((const char *) r->u.octet_aligned->buf,
- r->u.octet_aligned->len);
- }
- else if (oid && r->which == Z_External_octet)
- {
- const char *octet_buf = (char*)r->u.octet_aligned->buf;
- if (oid && (!oid_oidcmp(oid, yaz_oid_recsyn_xml)
- || !oid_oidcmp(oid, yaz_oid_recsyn_xml)
- || !oid_oidcmp(oid, yaz_oid_recsyn_html)))
+ const char *octet_buf = (const char*)r->u.octet_aligned->buf;
+ size_t octet_len = r->u.octet_aligned->len;
+ if (!oid_oidcmp(oid, yaz_oid_recsyn_xml)
+ || !oid_oidcmp(oid, yaz_oid_recsyn_xml)
+ || !oid_oidcmp(oid, yaz_oid_recsyn_html))
{
- print_record((const unsigned char *) octet_buf,
- r->u.octet_aligned->len);
+ fwrite(octet_buf, 1, octet_len, stdout);
}
- else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_postscript))
- {
- int size = r->u.octet_aligned->len;
- if (size > 100)
- size = 100;
- print_record((const unsigned char *) octet_buf, size);
- }
- else
+ else if (yaz_oid_is_iso2709(oid))
{
- if (oid && yaz_oid_is_iso2709(oid))
+ const char *result;
+ size_t rlen;
+ yaz_iconv_t cd = 0;
+ yaz_marc_t mt = yaz_marc_create();
+ const char *from = 0;
+
+ if (marcCharset && !strcmp(marcCharset, "auto"))
{
- const char *result;
- size_t rlen;
- yaz_iconv_t cd = 0;
- yaz_marc_t mt = yaz_marc_create();
- const char *from = 0;
-
- if (marcCharset && !strcmp(marcCharset, "auto"))
- {
- if (!oid_oidcmp(oid, yaz_oid_recsyn_usmarc))
- {
- if (octet_buf[9] == 'a')
- from = "UTF-8";
- else
- from = "MARC-8";
- }
- else
- from = "ISO-8859-1";
- }
- else if (marcCharset)
- from = marcCharset;
- if (outputCharset && from)
+ if (!oid_oidcmp(oid, yaz_oid_recsyn_usmarc))
{
- cd = yaz_iconv_open(outputCharset, from);
- printf("convert from %s to %s", from,
- outputCharset);
- if (!cd)
- printf(" unsupported\n");
+ if (octet_buf[9] == 'a')
+ from = "UTF-8";
else
- {
- yaz_marc_iconv(mt, cd);
- printf("\n");
- }
+ from = "MARC-8";
}
-
- if (yaz_marc_decode_buf(mt, octet_buf, r->u.octet_aligned->len,
- &result, &rlen)> 0)
+ else
+ from = "ISO-8859-1";
+ }
+ else if (marcCharset)
+ from = marcCharset;
+ if (outputCharset && from)
+ {
+ cd = yaz_iconv_open(outputCharset, from);
+ printf("convert from %s to %s", from,
+ outputCharset);
+ if (!cd)
+ printf(" unsupported\n");
+ else
{
- if (fwrite(result, rlen, 1, stdout) != 1)
- {
- printf("write to stdout failed\n");
- }
+ yaz_marc_iconv(mt, cd);
+ printf("\n");
}
- else
+ }
+
+ if (yaz_marc_decode_buf(mt, octet_buf, octet_len,
+ &result, &rlen)> 0)
+ {
+ if (fwrite(result, rlen, 1, stdout) != 1)
{
- printf("bad MARC. Dumping as it is:\n");
- print_record((const unsigned char*) octet_buf,
- r->u.octet_aligned->len);
+ printf("write to stdout failed\n");
}
- yaz_marc_destroy(mt);
- if (cd)
- yaz_iconv_close(cd);
}
else
{
- print_record((const unsigned char*) octet_buf,
- r->u.octet_aligned->len);
+ printf("bad MARC. Dumping as it is:\n");
+ print_record(octet_buf, octet_len);
}
+ yaz_marc_destroy(mt);
+ if (cd)
+ yaz_iconv_close(cd);
+ }
+ else
+ {
+ print_record(octet_buf, octet_len);
}
marc_file_write(octet_buf, r->u.octet_aligned->len);
}
printf("Expecting single SUTRS type for SUTRS.\n");
return;
}
- print_record(r->u.sutrs->buf, r->u.sutrs->len);
+ print_record((const char *) r->u.sutrs->buf, r->u.sutrs->len);
marc_file_write((const char *) r->u.sutrs->buf, r->u.sutrs->len);
}
else if (oid && !oid_oidcmp(oid, yaz_oid_recsyn_grs_1))
if (id)
{
printf("Target Reference: ");
- print_stringn (id->buf, id->len);
+ print_stringn((const char *) id->buf, id->len);
printf("\n");
}
if (ext->which == Z_External_update)
return 2;
}
+static Z_GDU *get_HTTP_Request_url(ODR odr, const char *url)
+{
+ Z_GDU *p = z_get_HTTP_Request(odr);
+ const char *host = url;
+ const char *cp0 = strstr(host, "://");
+ const char *cp1 = 0;
+ if (cp0)
+ cp0 = cp0+3;
+ else
+ cp0 = host;
+
+ cp1 = strchr(cp0, '/');
+ if (!cp1)
+ cp1 = cp0 + strlen(cp0);
+
+ if (cp0 && cp1)
+ {
+ char *h = (char*) odr_malloc(odr, cp1 - cp0 + 1);
+ memcpy (h, cp0, cp1 - cp0);
+ h[cp1-cp0] = '\0';
+ z_HTTP_header_add(odr, &p->u.HTTP_Request->headers, "Host", h);
+ }
+ p->u.HTTP_Request->path = odr_strdup(odr, *cp1 ? cp1 : "/");
+ return p;
+}
+
+static WRBUF get_url(const char *uri, WRBUF username, WRBUF password,
+ int *code, int show_headers)
+{
+ WRBUF result = 0;
+ ODR out = odr_createmem(ODR_ENCODE);
+ ODR in = odr_createmem(ODR_DECODE);
+ Z_GDU *gdu = get_HTTP_Request_url(out, uri);
+
+ gdu->u.HTTP_Request->method = odr_strdup(out, "GET");
+ if (username && password)
+ {
+ z_HTTP_header_add_basic_auth(out, &gdu->u.HTTP_Request->headers,
+ wrbuf_cstr(username),
+ wrbuf_cstr(password));
+ }
+ z_HTTP_header_add(out, &gdu->u.HTTP_Request->headers, "Accept",
+ "text/xml");
+ if (!z_GDU(out, &gdu, 0, 0))
+ {
+ yaz_log(YLOG_WARN, "Can not encode HTTP request URL:%s", uri);
+ }
+ else
+ {
+ void *add;
+ COMSTACK conn = cs_create_host(uri, 1, &add);
+ if (cs_connect(conn, add) < 0)
+ yaz_log(YLOG_WARN, "Can not connect to URL:%s", uri);
+ else
+ {
+ int len;
+ char *buf = odr_getbuf(out, &len, 0);
+
+ if (cs_put(conn, buf, len) < 0)
+ yaz_log(YLOG_WARN, "cs_put failed URL:%s", uri);
+ else
+ {
+ char *netbuffer = 0;
+ int netlen = 0;
+ int res = cs_get(conn, &netbuffer, &netlen);
+ if (res <= 0)
+ {
+ yaz_log(YLOG_WARN, "cs_get failed URL:%s", uri);
+ }
+ else
+ {
+ Z_GDU *gdu;
+ odr_setbuf(in, netbuffer, res, 0);
+ if (!z_GDU(in, &gdu, 0, 0)
+ || gdu->which != Z_GDU_HTTP_Response)
+ {
+ yaz_log(YLOG_WARN, "decode failed URL: %s", uri);
+ }
+ else
+ {
+ Z_HTTP_Response *res = gdu->u.HTTP_Response;
+ struct Z_HTTP_Header *h;
+ result = wrbuf_alloc();
+ if (show_headers)
+ {
+
+ wrbuf_printf(result, "HTTP %d\n", res->code);
+ for (h = res->headers; h; h = h->next)
+ wrbuf_printf(result, "%s: %s\n",
+ h->name, h->value);
+ }
+ *code = res->code;
+ wrbuf_write(result, res->content_buf, res->content_len);
+ }
+ }
+ xfree(netbuffer);
+ }
+ cs_close(conn);
+ }
+ }
+ odr_destroy(out);
+ odr_destroy(in);
+ return result;
+}
+
+
+static int cmd_url(const char *arg)
+{
+ int code = 0;
+ WRBUF res = get_url(arg, 0, 0, &code, 1);
+ if (res)
+ {
+ if (wrbuf_len(res) > 1200)
+ {
+ fwrite(wrbuf_buf(res), 1, 1200, stdout);
+ printf(".. out of %lld\n", (long long) wrbuf_len(res));
+ }
+ else
+ puts(wrbuf_cstr(res));
+ wrbuf_destroy(res);
+ }
+ return 0;
+}
+
static int cmd_sru(const char *arg)
{
if (!*arg)
if ((p = strchr(arg, '+')))
{
- *number = atoi(p + 1);
+ *number = odr_atoi(p + 1);
*p = '\0';
}
if (*arg)
*start = 1;
}
else
- *start = atoi(arg);
+ *start = odr_atoi(arg);
}
if (p && (p=strchr(p+1, '+')))
strcpy(setstring, p+1);
{"help", cmd_help, "", NULL,0,NULL},
{"init", cmd_init, "", NULL,0,NULL},
{"sru", cmd_sru, "<method> <version>", NULL,0,NULL},
+ {"url", cmd_url, "<url>", NULL,0,NULL},
{"exit", cmd_quit, "",NULL,0,NULL},
{0,0,0,0,0,0}
};