X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fzoom-c.c;h=bf4beb0913d63bd7f46a05595e365cdf9931f5ce;hb=4cd3f359d12ddfecd1f112cb81235a70a67f8665;hp=9496de66e8dd3e4b2a397342010683a1819b485c;hpb=401da56d4a26f687cd42024bdef6f29a29bb7663;p=yaz-moved-to-github.git diff --git a/src/zoom-c.c b/src/zoom-c.c index 9496de6..bf4beb0 100644 --- a/src/zoom-c.c +++ b/src/zoom-c.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2007, Index Data ApS * See the file LICENSE for details. * - * $Id: zoom-c.c,v 1.117 2007-03-19 14:40:07 adam Exp $ + * $Id: zoom-c.c,v 1.122 2007-03-21 11:27:46 adam Exp $ */ /** * \file zoom-c.c @@ -27,8 +27,6 @@ #include #include -#define TASK_FIX 1 - static int log_api = 0; static int log_details = 0; @@ -168,9 +166,7 @@ static void set_dset_error(ZOOM_connection c, int error, c, c->host_port ? c->host_port : "<>", dset, error, addinfo ? addinfo : "", addinfo2 ? addinfo2 : ""); -#if TASK_FIX ZOOM_connection_remove_tasks(c); -#endif } } @@ -857,16 +853,11 @@ ZOOM_API(ZOOM_resultset) return r; } -/* - * This is the old result-set sorting API, which is maintained only - * for the sake of binary compatibility. There is no reason ever to - * use this rather than ZOOM_resultset_sort1(). - */ ZOOM_API(void) ZOOM_resultset_sort(ZOOM_resultset r, - const char *sort_type, const char *sort_spec) + const char *sort_type, const char *sort_spec) { - (void) ZOOM_resultset_sort1(r, sort_type, sort_spec); + (void) ZOOM_resultset_sort(r, sort_type, sort_spec); } ZOOM_API(int) @@ -1300,7 +1291,7 @@ static zoom_ret ZOOM_connection_send_init(ZOOM_connection c) odr_prepend(c->odr_out, "ZOOM-C", ireq->implementationName)); - version = odr_strdup(c->odr_out, "$Revision: 1.117 $"); + version = odr_strdup(c->odr_out, "$Revision: 1.122 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; ireq->implementationVersion = @@ -1805,6 +1796,7 @@ static const char *record_iconv_return(ZOOM_record rec, int *len, *from = '\0'; strcpy(to, "UTF-8"); + if (record_charset && *record_charset) { /* Use "from,to" or just "from" */ @@ -1826,30 +1818,14 @@ static const char *record_iconv_return(ZOOM_record rec, int *len, if (*from && *to && (cd = yaz_iconv_open(to, from))) { - char outbuf[12]; - size_t inbytesleft = sz; - const char *inp = buf; - if (!rec->wrbuf_iconv) rec->wrbuf_iconv = wrbuf_alloc(); wrbuf_rewind(rec->wrbuf_iconv); - while (inbytesleft) - { - size_t outbytesleft = sizeof(outbuf); - char *outp = outbuf; - size_t r = yaz_iconv(cd, (char**) &inp, - &inbytesleft, - &outp, &outbytesleft); - if (r == (size_t) (-1)) - { - int e = yaz_iconv_error(cd); - if (e != YAZ_ICONV_E2BIG) - break; - } - wrbuf_write(rec->wrbuf_iconv, outbuf, outp - outbuf); - } + wrbuf_iconv_write(rec->wrbuf_iconv, cd, buf, sz); + wrbuf_iconv_reset(rec->wrbuf_iconv, cd); + buf = wrbuf_cstr(rec->wrbuf_iconv); sz = wrbuf_len(rec->wrbuf_iconv); yaz_iconv_close(cd); @@ -4107,6 +4083,12 @@ ZOOM_API(int) } +static void cql2pqf_wrbuf_puts(const char *buf, void *client_data) +{ + WRBUF wrbuf = client_data; + wrbuf_puts(wrbuf, buf); +} + /* * Returns an xmalloc()d string containing RPN that corresponds to the * CQL passed in. On error, sets the Connection object's error state @@ -4117,10 +4099,9 @@ static char *cql2pqf(ZOOM_connection c, const char *cql) { CQL_parser parser; int error; - struct cql_node *node; const char *cqlfile; - static cql_transform_t trans; - char pqfbuf[512]; + cql_transform_t trans; + char *result = 0; parser = cql_parser_create(); if ((error = cql_parser_string(parser, cql)) != 0) { @@ -4129,42 +4110,40 @@ static char *cql2pqf(ZOOM_connection c, const char *cql) return 0; } - node = cql_parser_result(parser); - /* ### Do not call cql_parser_destroy() yet: it destroys `node'! */ - cqlfile = ZOOM_connection_option_get(c, "cqlfile"); - if (cqlfile == 0) { - cql_parser_destroy(parser); - cql_node_destroy(node); + if (cqlfile == 0) + { set_ZOOM_error(c, ZOOM_ERROR_CQL_TRANSFORM, "no CQL transform file"); - return 0; } - - if ((trans = cql_transform_open_fname(cqlfile)) == 0) { + else if ((trans = cql_transform_open_fname(cqlfile)) == 0) + { char buf[512]; - cql_parser_destroy(parser); - cql_node_destroy(node); sprintf(buf, "can't open CQL transform file '%.200s': %.200s", cqlfile, strerror(errno)); set_ZOOM_error(c, ZOOM_ERROR_CQL_TRANSFORM, buf); - return 0; } - - error = cql_transform_buf(trans, node, pqfbuf, sizeof pqfbuf); - cql_parser_destroy(parser); - cql_node_destroy(node); - if (error != 0) { - char buf[512]; - const char *addinfo; - error = cql_transform_error(trans, &addinfo); + else + { + WRBUF wrbuf_result = wrbuf_alloc(); + error = cql_transform(trans, cql_parser_result(parser), + cql2pqf_wrbuf_puts, wrbuf_result); + if (error != 0) { + char buf[512]; + const char *addinfo; + error = cql_transform_error(trans, &addinfo); + sprintf(buf, "%.200s (addinfo=%.200s)", + cql_strerror(error), addinfo); + set_ZOOM_error(c, ZOOM_ERROR_CQL_TRANSFORM, buf); + } + else + { + result = xstrdup(wrbuf_cstr(wrbuf_result)); + } cql_transform_close(trans); - sprintf(buf, "%.200s (addinfo=%.200s)", cql_strerror(error), addinfo); - set_ZOOM_error(c, ZOOM_ERROR_CQL_TRANSFORM, buf); - return 0; + wrbuf_destroy(wrbuf_result); } - - cql_transform_close(trans); - return xstrdup(pqfbuf); + cql_parser_destroy(parser); + return result; } ZOOM_API(int) ZOOM_connection_fire_event_timeout(ZOOM_connection c)