X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-c.c;h=bea723fdc6849c9949b9159716efa201e3c87177;hp=5af33a06f723547a12aa56e126f1b1914b939a12;hb=d136ea45c75630579ad66054d0d93708ab79a29b;hpb=1325ab853fdccee0f1a6659ef216eb96b8b6b39c diff --git a/src/zoom-c.c b/src/zoom-c.c index 5af33a0..bea723f 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.151 2007-09-21 16:04:48 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) @@ -598,6 +596,13 @@ ZOOM_API(void) ZOOM_options_get_int(c->options, "preferredMessageSize", 1024*1024); c->async = ZOOM_options_get_bool(c->options, "async", 0); + if (ZOOM_options_get_bool(c->options, "apdulog", 0)) + { + c->odr_print = odr_createmem(ODR_PRINT); + odr_setprint(c->odr_print, yaz_log_file()); + } + else + c->odr_print = 0; yaz_log(log_details, "%p ZOOM_connection_connect async=%d", c, c->async); task = ZOOM_connection_add_task(c, ZOOM_TASK_CONNECT); @@ -776,6 +781,11 @@ ZOOM_API(void) xfree(c->diagset); odr_destroy(c->odr_in); odr_destroy(c->odr_out); + if (c->odr_print) + { + odr_setprint(c->odr_print, 0); /* prevent destroy from fclose'ing */ + odr_destroy(c->odr_print); + } ZOOM_options_destroy(c->options); ZOOM_connection_remove_tasks(c); ZOOM_connection_remove_events(c); @@ -1303,6 +1313,8 @@ static int encode_APDU(ZOOM_connection c, Z_APDU *a, ODR out) odr_reset(out); return -1; } + if (c->odr_print) + z_APDU(c->odr_print, &a, 0, 0); yaz_log(log_details, "%p encoding_APDU encoding OK", c); return 0; } @@ -1356,7 +1368,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.151 $"); + 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 = @@ -1431,6 +1443,8 @@ static zoom_ret send_srw(ZOOM_connection c, Z_SRW_PDU *sr) } if (!z_GDU(c->odr_out, &gdu, 0, 0)) return zoom_complete; + if (c->odr_print) + z_GDU(c->odr_print, &gdu, 0, 0); c->buf_out = odr_getbuf(c->odr_out, &c->len_out, 0); event = ZOOM_Event_create(ZOOM_EVENT_SEND_APDU); @@ -1448,7 +1462,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 +1547,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 @@ -2640,8 +2652,12 @@ static zoom_ret send_present(ZOOM_connection c) yaz_log(log_details, "%p send_present skip=%d", c, i); *req->resultSetStartPoint = *start + 1; - *req->numberOfRecordsRequested = resultset->step>0 ? - resultset->step : *count; + + if (resultset->step > 0 && resultset->step < *count) + *req->numberOfRecordsRequested = resultset->step; + else + *req->numberOfRecordsRequested = *count; + if (*req->numberOfRecordsRequested + *start > resultset->size) *req->numberOfRecordsRequested = resultset->size - *start; assert(*req->numberOfRecordsRequested > 0); @@ -2902,8 +2918,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 @@ -3121,6 +3136,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 *) @@ -3172,11 +3188,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); @@ -3239,10 +3255,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; @@ -3251,8 +3271,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; } @@ -3263,9 +3282,16 @@ 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); + int recordOpaque_len; + const char *recordOpaque_buf = ZOOM_options_getl(p->options, "recordOpaque", + &recordOpaque_len); const char *syntax_str = ZOOM_options_get(p->options, "syntax"); const char *version = ZOOM_options_get(p->options, "updateVersion"); @@ -3281,9 +3307,10 @@ static Z_APDU *create_update_package(ZOOM_package p) version = "3"; if (!syntax_str) syntax_str = "xml"; - if (!record_buf) + if (!record_buf && !recordOpaque_buf) { record_buf = "void"; + record_len = 4; syntax_str = "SUTRS"; } @@ -3382,7 +3409,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) { @@ -3398,16 +3425,25 @@ 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; } else notToKeep->elements[0]->correlationInfo = 0; - notToKeep->elements[0]->record = - z_ext_record_oid(p->odr_out, syntax_oid, - record_buf, strlen(record_buf)); + if (recordOpaque_buf) + { + notToKeep->elements[0]->record = + z_ext_record_oid_any(p->odr_out, syntax_oid, + recordOpaque_buf, recordOpaque_len); + } + else + { + notToKeep->elements[0]->record = + z_ext_record_oid(p->odr_out, syntax_oid, + record_buf, record_len); + } } if (0 && apdu) { @@ -3528,6 +3564,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, @@ -3536,6 +3577,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; @@ -3624,22 +3672,90 @@ static zoom_ret send_sort_present(ZOOM_connection c) return r; } +static int es_response_taskpackage_update(ZOOM_connection c, + Z_IUUpdateTaskPackage *utp) +{ + if (utp && utp->targetPart) + { + Z_IUTargetPart *targetPart = utp->targetPart; + switch ( *targetPart->updateStatus ) { + case Z_IUTargetPart_success: + ZOOM_options_set(c->tasks->u.package->options,"updateStatus", "success"); + break; + case Z_IUTargetPart_partial: + ZOOM_options_set(c->tasks->u.package->options,"updateStatus", "partial"); + break; + case Z_IUTargetPart_failure: + ZOOM_options_set(c->tasks->u.package->options,"updateStatus", "failure"); + if (targetPart->globalDiagnostics && targetPart->num_globalDiagnostics > 0) + response_diag(c, targetPart->globalDiagnostics[0]); + break; + } + // NOTE: Individual record status, surrogate diagnostics, and supplemental diagnostics ARE NOT REPORTED. + } + return 1; +} + +static int es_response_taskpackage(ZOOM_connection c, + Z_TaskPackage *taskPackage) +{ + // targetReference + Odr_oct *id = taskPackage->targetReference; + if (id) + ZOOM_options_setl(c->tasks->u.package->options, + "targetReference", (char*) id->buf, id->len); + + // taskStatus + switch ( *taskPackage->taskStatus ) { + case Z_TaskPackage_pending: + ZOOM_options_set(c->tasks->u.package->options,"taskStatus", "pending"); + break; + case Z_TaskPackage_active: + ZOOM_options_set(c->tasks->u.package->options,"taskStatus", "active"); + break; + case Z_TaskPackage_complete: + ZOOM_options_set(c->tasks->u.package->options,"taskStatus", "complete"); + break; + case Z_TaskPackage_aborted: + ZOOM_options_set(c->tasks->u.package->options,"taskStatus", "aborted"); + if ( taskPackage->num_packageDiagnostics && taskPackage->packageDiagnostics ) + response_diag(c, taskPackage->packageDiagnostics[0]); + break; + } + + // taskSpecificParameters + // NOTE: Only Update implemented, no others. + if ( taskPackage->taskSpecificParameters->which == Z_External_update ) { + Z_IUUpdateTaskPackage *utp = taskPackage->taskSpecificParameters->u.update->u.taskPackage; + es_response_taskpackage_update(c, utp); + } + return 1; +} + + static int es_response(ZOOM_connection c, Z_ExtendedServicesResponse *res) { if (!c->tasks || c->tasks->which != ZOOM_TASK_PACKAGE) return 0; - if (res->diagnostics && res->num_diagnostics > 0) - response_diag(c, res->diagnostics[0]); + switch (*res->operationStatus) { + case Z_ExtendedServicesResponse_done: + ZOOM_options_set(c->tasks->u.package->options,"operationStatus", "done"); + break; + case Z_ExtendedServicesResponse_accepted: + ZOOM_options_set(c->tasks->u.package->options,"operationStatus", "accepted"); + break; + case Z_ExtendedServicesResponse_failure: + ZOOM_options_set(c->tasks->u.package->options,"operationStatus", "failure"); + if (res->diagnostics && res->num_diagnostics > 0) + response_diag(c, res->diagnostics[0]); + break; + } if (res->taskPackage && res->taskPackage->which == Z_External_extendedService) { Z_TaskPackage *taskPackage = res->taskPackage->u.extendedService; - Odr_oct *id = taskPackage->targetReference; - - if (id) - ZOOM_options_setl(c->tasks->u.package->options, - "targetReference", (char*) id->buf, id->len); + es_response_taskpackage(c, taskPackage); } if (res->taskPackage && res->taskPackage->which == Z_External_octet) @@ -4067,16 +4183,21 @@ static int do_read(ZOOM_connection c) } do_close(c); } - else if (gdu->which == Z_GDU_Z3950) - recv_apdu(c, gdu->u.z3950); - else if (gdu->which == Z_GDU_HTTP_Response) + else { + if (c->odr_print) + z_GDU(c->odr_print, &gdu, 0, 0); + if (gdu->which == Z_GDU_Z3950) + recv_apdu(c, gdu->u.z3950); + else if (gdu->which == Z_GDU_HTTP_Response) + { #if YAZ_HAVE_XML2 - handle_http(c, gdu->u.HTTP_Response); + handle_http(c, gdu->u.HTTP_Response); #else - set_ZOOM_error(c, ZOOM_ERROR_DECODE, 0); - do_close(c); + set_ZOOM_error(c, ZOOM_ERROR_DECODE, 0); + do_close(c); #endif + } } c->reconnect_ok = 0; }