X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-c.c;h=b59c14ab835b3699bcea2fd5f68d6f5fea9e561c;hp=8d45ee40783965aa261f7a263aa01f833a40ff03;hb=d940392c53c32ccf76fb287cc5b997b9e921a431;hpb=a37c6b37804b2cad867b2740488f50e96007ba65 diff --git a/src/zoom-c.c b/src/zoom-c.c index 8d45ee4..b59c14a 100644 --- a/src/zoom-c.c +++ b/src/zoom-c.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2008 Index Data * See the file LICENSE for details. - * - * $Id: zoom-c.c,v 1.149 2007-09-11 16:36:51 adam Exp $ */ /** * \file zoom-c.c @@ -49,7 +47,7 @@ static char *cql2pqf(ZOOM_connection c, const char *cql); * if it could cause failure when a lookup fails, but that's hard. */ static Odr_oid *zoom_yaz_str_to_z3950oid(ZOOM_connection c, - int oid_class, const char *str) { + oid_class oid_class, const char *str) { Odr_oid *res = yaz_string_to_oid_odr(yaz_oid_std(), oid_class, str, c->odr_out); if (res == 0) @@ -174,13 +172,6 @@ static void set_dset_error(ZOOM_connection c, int error, } } -#if YAZ_HAVE_XML2 -static void set_HTTP_error(ZOOM_connection c, int error, - const char *addinfo, const char *addinfo2) -{ - set_dset_error(c, error, "HTTP", addinfo, addinfo2); -} - static int uri_to_code(const char *uri) { int code = 0; @@ -190,6 +181,13 @@ static int uri_to_code(const char *uri) return code; } +#if YAZ_HAVE_XML2 +static void set_HTTP_error(ZOOM_connection c, int error, + const char *addinfo, const char *addinfo2) +{ + set_dset_error(c, error, "HTTP", addinfo, addinfo2); +} + static void set_SRU_error(ZOOM_connection c, Z_SRW_diagnostic *d) { const char *uri = d->uri; @@ -1356,7 +1354,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.149 $"); + version = odr_strdup(c->odr_out, "$Revision: 1.154 $"); if (strlen(version) > 10) /* check for unexpanded CVS strings */ version[strlen(version)-2] = '\0'; ireq->implementationVersion = @@ -1448,7 +1446,6 @@ static Z_SRW_PDU *ZOOM_srw_get_pdu(ZOOM_connection c, int type) { return sr; } - #if YAZ_HAVE_XML2 static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) { @@ -1534,8 +1531,7 @@ static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) sr->u.request->recordPacking = odr_strdup(c->odr_out, option_val); option_val = ZOOM_resultset_option_get(resultset, "extraArgs"); - if (option_val) - sr->extra_args = odr_strdup(c->odr_out, option_val); + yaz_encode_sru_extra(sr, c->odr_out, option_val); return send_srw(c, sr); } #else @@ -2243,6 +2239,7 @@ static void record_cache_add(ZOOM_resultset r, Z_NamePlusRecord *npr, rc->rec.schema = odr_strdup_null(r->odr, schema); rc->rec.diag_set = 0; rc->rec.diag_uri = 0; + rc->rec.diag_message = 0; rc->rec.diag_details = 0; if (diag) { @@ -2901,8 +2898,7 @@ static zoom_ret ZOOM_connection_srw_send_scan(ZOOM_connection c) c->odr_out, ZOOM_options_get_int(scan->options, "position", 1)); option_val = ZOOM_options_get(scan->options, "extraArgs"); - if (option_val) - sr->extra_args = odr_strdup(c->odr_out, option_val); + yaz_encode_sru_extra(sr, c->odr_out, option_val); return send_srw(c, sr); } #else @@ -3120,6 +3116,7 @@ static Z_ItemOrder *encode_item_order(ZOOM_package p) { Z_ItemOrder *req = (Z_ItemOrder *) odr_malloc(p->odr_out, sizeof(*req)); const char *str; + int len; req->which = Z_IOItemOrder_esRequest; req->u.esRequest = (Z_IORequest *) @@ -3171,11 +3168,11 @@ static Z_ItemOrder *encode_item_order(ZOOM_package p) (str ? atoi(str) : 1); } - str = ZOOM_options_get(p->options, "doc"); + str = ZOOM_options_getl(p->options, "doc", &len); if (str) { req->u.esRequest->notToKeep->itemRequest = - z_ext_record_xml(p->odr_out, str, strlen(str)); + z_ext_record_xml(p->odr_out, str, len); } else req->u.esRequest->notToKeep->itemRequest = encode_ill_request(p); @@ -3238,10 +3235,14 @@ static Z_APDU *create_xmlupdate_package(ZOOM_package p) Z_APDU *apdu = create_es_package(p, yaz_oid_extserv_xml_es); Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; Z_External *ext = (Z_External *) odr_malloc(p->odr_out, sizeof(*ext)); - const char *doc = ZOOM_options_get(p->options, "doc"); + int len; + const char *doc = ZOOM_options_getl(p->options, "doc", &len); if (!doc) + { doc = ""; + len = 0; + } req->taskSpecificParameters = ext; ext->direct_reference = req->packageType; @@ -3250,8 +3251,7 @@ static Z_APDU *create_xmlupdate_package(ZOOM_package p) ext->which = Z_External_octet; ext->u.single_ASN1_type = - odr_create_Odr_oct(p->odr_out, (const unsigned char *) doc, - strlen(doc)); + odr_create_Odr_oct(p->odr_out, (const unsigned char *) doc, len); return apdu; } @@ -3262,9 +3262,13 @@ static Z_APDU *create_update_package(ZOOM_package p) int num_db; char **db = set_DatabaseNames(p->connection, p->options, &num_db, p->odr_out); const char *action = ZOOM_options_get(p->options, "action"); - const char *recordIdOpaque = ZOOM_options_get(p->options, "recordIdOpaque"); + int recordIdOpaque_len; + const char *recordIdOpaque = ZOOM_options_getl(p->options, "recordIdOpaque", + &recordIdOpaque_len); const char *recordIdNumber = ZOOM_options_get(p->options, "recordIdNumber"); - const char *record_buf = ZOOM_options_get(p->options, "record"); + int record_len; + const char *record_buf = ZOOM_options_getl(p->options, "record", + &record_len); const char *syntax_str = ZOOM_options_get(p->options, "syntax"); const char *version = ZOOM_options_get(p->options, "updateVersion"); @@ -3283,6 +3287,7 @@ static Z_APDU *create_update_package(ZOOM_package p) if (!record_buf) { record_buf = "void"; + record_len = 4; syntax_str = "SUTRS"; } @@ -3381,7 +3386,7 @@ static Z_APDU *create_update_package(ZOOM_package p) notToKeep->elements[0]->u.opaque = odr_create_Odr_oct(p->odr_out, (const unsigned char *) recordIdOpaque, - strlen(recordIdOpaque)); + recordIdOpaque_len); } else if (recordIdNumber) { @@ -3397,7 +3402,7 @@ static Z_APDU *create_update_package(ZOOM_package p) { Z_IUCorrelationInfo *ci; ci = notToKeep->elements[0]->correlationInfo = - odr_malloc(p->odr_out, sizeof(*ci)); + (Z_IUCorrelationInfo *) odr_malloc(p->odr_out, sizeof(*ci)); ci->note = odr_strdup_null(p->odr_out, correlationInfo_note); ci->id = correlationInfo_id ? odr_intdup(p->odr_out, atoi(correlationInfo_id)) : 0; @@ -3406,7 +3411,7 @@ static Z_APDU *create_update_package(ZOOM_package p) notToKeep->elements[0]->correlationInfo = 0; notToKeep->elements[0]->record = z_ext_record_oid(p->odr_out, syntax_oid, - record_buf, strlen(record_buf)); + record_buf, record_len); } if (0 && apdu) { @@ -3527,6 +3532,11 @@ ZOOM_API(const char *) return ZOOM_options_get(p->options, key); } +ZOOM_API(const char *) + ZOOM_package_option_getl(ZOOM_package p, const char *key, int *lenp) +{ + return ZOOM_options_getl(p->options, key, lenp); +} ZOOM_API(void) ZOOM_package_option_set(ZOOM_package p, const char *key, @@ -3535,6 +3545,13 @@ ZOOM_API(void) ZOOM_options_set(p->options, key, val); } +ZOOM_API(void) + ZOOM_package_option_setl(ZOOM_package p, const char *key, + const char *val, int len) +{ + ZOOM_options_setl(p->options, key, val, len); +} + static int ZOOM_connection_exec_task(ZOOM_connection c) { ZOOM_task task = c->tasks;