X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fzoom-c.c;h=fe7971dfe0889755cc7b26f2a5437c41e760337e;hp=8d45ee40783965aa261f7a263aa01f833a40ff03;hb=c92a1e74838a25214df478878806c7fb48167db5;hpb=a37c6b37804b2cad867b2740488f50e96007ba65 diff --git a/src/zoom-c.c b/src/zoom-c.c index 8d45ee4..fe7971d 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 @@ -43,13 +41,30 @@ static zoom_ret ZOOM_connection_send_init(ZOOM_connection c); static zoom_ret do_write_ex(ZOOM_connection c, char *buf_out, int len_out); static char *cql2pqf(ZOOM_connection c, const char *cql); +ZOOM_API(const char *) ZOOM_get_event_str(int event) +{ + static const char *ar[] = { + "NONE", + "CONNECT", + "SEND_DATA", + "RECV_DATA", + "TIMEOUT", + "UNKNOWN", + "SEND_APDU", + "RECV_APDU", + "RECV_RECORD", + "RECV_SEARCH", + "END" + }; + return ar[event]; +} /* * This wrapper is just for logging failed lookups. It would be nicer * 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 +189,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 +198,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; @@ -246,7 +261,7 @@ void ZOOM_connection_show_task(ZOOM_task task) yaz_log(YLOG_LOG, "connect p=%p", task); break; case ZOOM_TASK_SCAN: - yaz_log(YLOG_LOG, "scant p=%p", task); + yaz_log(YLOG_LOG, "scan p=%p", task); break; } } @@ -464,6 +479,14 @@ ZOOM_API(void) set_ZOOM_error(c, ZOOM_ERROR_NONE, 0); ZOOM_connection_remove_tasks(c); + 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; + if (c->cs) { yaz_log(log_details, "%p ZOOM_connection_connect reconnect ok", c); @@ -776,6 +799,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); @@ -902,6 +930,7 @@ ZOOM_API(ZOOM_resultset) task->u.search.resultset = r; task->u.search.start = start; task->u.search.count = count; + task->u.search.recv_search_fired = 0; syntax = ZOOM_options_get(r->options, "preferredRecordSyntax"); task->u.search.syntax = syntax ? xstrdup(syntax) : 0; @@ -1303,6 +1332,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; } @@ -1331,7 +1362,6 @@ static zoom_ret ZOOM_connection_send_init(ZOOM_connection c) Z_InitRequest *ireq = apdu->u.initRequest; Z_IdAuthentication *auth = (Z_IdAuthentication *) odr_malloc(c->odr_out, sizeof(*auth)); - char *version; ODR_MASK_SET(ireq->options, Z_Options_search); ODR_MASK_SET(ireq->options, Z_Options_present); @@ -1344,11 +1374,10 @@ static zoom_ret ZOOM_connection_send_init(ZOOM_connection c) ODR_MASK_SET(ireq->protocolVersion, Z_ProtocolVersion_2); ODR_MASK_SET(ireq->protocolVersion, Z_ProtocolVersion_3); - /* Index Data's Z39.50 Implementor Id is 81 */ ireq->implementationId = odr_prepend(c->odr_out, ZOOM_options_get(c->options, "implementationId"), - odr_prepend(c->odr_out, "81", ireq->implementationId)); + ireq->implementationId); ireq->implementationName = odr_prepend(c->odr_out, @@ -1356,14 +1385,10 @@ 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 $"); - if (strlen(version) > 10) /* check for unexpanded CVS strings */ - version[strlen(version)-2] = '\0'; ireq->implementationVersion = odr_prepend(c->odr_out, ZOOM_options_get(c->options, "implementationVersion"), - odr_prepend(c->odr_out, &version[11], - ireq->implementationVersion)); + ireq->implementationVersion); *ireq->maximumRecordSize = c->maximum_record_size; *ireq->preferredMessageSize = c->preferred_message_size; @@ -1414,8 +1439,17 @@ static zoom_ret send_srw(ZOOM_connection c, Z_SRW_PDU *sr) { Z_GDU *gdu; ZOOM_Event event; - - gdu = z_get_HTTP_Request_host_path(c->odr_out, c->host_port, c->path); + const char *database = ZOOM_options_get(c->options, "databaseName"); + char *fdatabase = 0; + + if (database) + { + fdatabase = (char *) odr_malloc(c->odr_out, strlen(database)+2); + strcpy(fdatabase, "/"); + strcat(fdatabase, database); + } + gdu = z_get_HTTP_Request_host_path(c->odr_out, c->host_port, + fdatabase ? fdatabase : c->path); if (c->sru_mode == zoom_sru_get) { @@ -1431,6 +1465,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); @@ -1440,14 +1476,15 @@ static zoom_ret send_srw(ZOOM_connection c, Z_SRW_PDU *sr) } #endif - -static Z_SRW_PDU *ZOOM_srw_get_pdu(ZOOM_connection c, int type) { +#if YAZ_HAVE_XML2 +static Z_SRW_PDU *ZOOM_srw_get_pdu(ZOOM_connection c, int type) +{ Z_SRW_PDU *sr = yaz_srw_get_pdu(c->odr_out, type, c->sru_version); sr->username = c->user; sr->password = c->password; return sr; } - +#endif #if YAZ_HAVE_XML2 static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) @@ -1465,7 +1502,8 @@ static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) { case ZOOM_TASK_SEARCH: resultset = c->tasks->u.search.resultset; - resultset->setname = xstrdup("default"); + if (!resultset->setname) + resultset->setname = xstrdup("default"); ZOOM_options_set(resultset->options, "setname", resultset->setname); start = &c->tasks->u.search.start; count = &c->tasks->u.search.count; @@ -1475,7 +1513,7 @@ static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) start = &c->tasks->u.retrieve.start; count = &c->tasks->u.retrieve.count; - + if (*start >= resultset->size) return zoom_complete; if (*start + *count > resultset->size) @@ -1526,7 +1564,8 @@ static zoom_ret ZOOM_connection_srw_send_search(ZOOM_connection c) } sr->u.request->startRecord = odr_intdup(c->odr_out, *start + 1); sr->u.request->maximumRecords = odr_intdup( - c->odr_out, resultset->step>0 ? resultset->step : *count); + c->odr_out, (resultset->step > 0 && resultset->step < *count) ? + resultset->step : *count); sr->u.request->recordSchema = resultset->schema; option_val = ZOOM_resultset_option_get(resultset, "recordPacking"); @@ -1534,8 +1573,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 +2281,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) { @@ -2639,8 +2678,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); @@ -2901,8 +2944,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 +3162,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 +3214,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 +3281,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 +3297,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 +3308,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"); @@ -3280,9 +3333,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"; } @@ -3381,7 +3435,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,16 +3451,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) { @@ -3527,6 +3590,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 +3603,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; @@ -3623,22 +3698,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) @@ -3825,38 +3968,45 @@ static void recv_apdu(ZOOM_connection c, Z_APDU *apdu) } #if YAZ_HAVE_XML2 -static void handle_srw_response(ZOOM_connection c, - Z_SRW_searchRetrieveResponse *res) +static zoom_ret handle_srw_response(ZOOM_connection c, + Z_SRW_searchRetrieveResponse *res) { ZOOM_resultset resultset = 0; int i; NMEM nmem; ZOOM_Event event; - int *start; + int *start, *count; const char *syntax, *elementSetName; if (!c->tasks) - return; + return zoom_complete; switch(c->tasks->which) { case ZOOM_TASK_SEARCH: resultset = c->tasks->u.search.resultset; start = &c->tasks->u.search.start; + count = &c->tasks->u.search.count; syntax = c->tasks->u.search.syntax; elementSetName = c->tasks->u.search.elementSetName; + + if (!c->tasks->u.search.recv_search_fired) + { + event = ZOOM_Event_create(ZOOM_EVENT_RECV_SEARCH); + ZOOM_connection_put_event(c, event); + c->tasks->u.search.recv_search_fired = 1; + } break; case ZOOM_TASK_RETRIEVE: resultset = c->tasks->u.retrieve.resultset; start = &c->tasks->u.retrieve.start; + count = &c->tasks->u.retrieve.count; syntax = c->tasks->u.retrieve.syntax; elementSetName = c->tasks->u.retrieve.elementSetName; break; default: - return; + return zoom_complete; } - event = ZOOM_Event_create(ZOOM_EVENT_RECV_SEARCH); - ZOOM_connection_put_event(c, event); resultset->size = 0; @@ -3864,62 +4014,77 @@ static void handle_srw_response(ZOOM_connection c, ZOOM_resultset_option_set(resultset, "resultSetId", res->resultSetId); yaz_log(log_details, "%p handle_srw_response got SRW response OK", c); - - if (res->numberOfRecords) - resultset->size = *res->numberOfRecords; - for (i = 0; inum_records; i++) + if (res->num_diagnostics > 0) { - int pos; - Z_SRW_record *sru_rec; - Z_SRW_diagnostic *diag = 0; - int num_diag; - - Z_NamePlusRecord *npr = (Z_NamePlusRecord *) - odr_malloc(c->odr_in, sizeof(Z_NamePlusRecord)); - - if (res->records[i].recordPosition && - *res->records[i].recordPosition > 0) - pos = *res->records[i].recordPosition - 1; - else - pos = *start + i; - - sru_rec = &res->records[i]; - - npr->databaseName = 0; - npr->which = Z_NamePlusRecord_databaseRecord; - npr->u.databaseRecord = (Z_External *) - odr_malloc(c->odr_in, sizeof(Z_External)); - npr->u.databaseRecord->descriptor = 0; - npr->u.databaseRecord->direct_reference = - odr_oiddup(c->odr_in, yaz_oid_recsyn_xml); - npr->u.databaseRecord->which = Z_External_octet; - - npr->u.databaseRecord->u.octet_aligned = (Odr_oct *) - odr_malloc(c->odr_in, sizeof(Odr_oct)); - npr->u.databaseRecord->u.octet_aligned->buf = (unsigned char*) - sru_rec->recordData_buf; - npr->u.databaseRecord->u.octet_aligned->len = - npr->u.databaseRecord->u.octet_aligned->size = - sru_rec->recordData_len; - - if (sru_rec->recordSchema - && !strcmp(sru_rec->recordSchema, - "info:srw/schema/1/diagnostics-v1.1")) + set_SRU_error(c, &res->diagnostics[0]); + } + else + { + if (res->numberOfRecords) + resultset->size = *res->numberOfRecords; + for (i = 0; inum_records; i++) { - sru_decode_surrogate_diagnostics(sru_rec->recordData_buf, - sru_rec->recordData_len, - &diag, &num_diag, - resultset->odr); + int pos; + Z_SRW_record *sru_rec; + Z_SRW_diagnostic *diag = 0; + int num_diag; + + Z_NamePlusRecord *npr = (Z_NamePlusRecord *) + odr_malloc(c->odr_in, sizeof(Z_NamePlusRecord)); + + if (res->records[i].recordPosition && + *res->records[i].recordPosition > 0) + pos = *res->records[i].recordPosition - 1; + else + pos = *start + i; + + sru_rec = &res->records[i]; + + npr->databaseName = 0; + npr->which = Z_NamePlusRecord_databaseRecord; + npr->u.databaseRecord = (Z_External *) + odr_malloc(c->odr_in, sizeof(Z_External)); + npr->u.databaseRecord->descriptor = 0; + npr->u.databaseRecord->direct_reference = + odr_oiddup(c->odr_in, yaz_oid_recsyn_xml); + npr->u.databaseRecord->which = Z_External_octet; + + npr->u.databaseRecord->u.octet_aligned = (Odr_oct *) + odr_malloc(c->odr_in, sizeof(Odr_oct)); + npr->u.databaseRecord->u.octet_aligned->buf = (unsigned char*) + sru_rec->recordData_buf; + npr->u.databaseRecord->u.octet_aligned->len = + npr->u.databaseRecord->u.octet_aligned->size = + sru_rec->recordData_len; + + if (sru_rec->recordSchema + && !strcmp(sru_rec->recordSchema, + "info:srw/schema/1/diagnostics-v1.1")) + { + sru_decode_surrogate_diagnostics(sru_rec->recordData_buf, + sru_rec->recordData_len, + &diag, &num_diag, + resultset->odr); + } + record_cache_add(resultset, npr, pos, syntax, elementSetName, + sru_rec->recordSchema, diag); } - record_cache_add(resultset, npr, pos, syntax, elementSetName, - sru_rec->recordSchema, diag); + *count -= i; + *start += i; + if (*count + *start > resultset->size) + *count = resultset->size - *start; + if (*count < 0) + *count = 0; + + nmem = odr_extract_mem(c->odr_in); + nmem_transfer(odr_getmem(resultset->odr), nmem); + nmem_destroy(nmem); + + if (*count > 0) + return ZOOM_connection_srw_send_search(c); } - if (res->num_diagnostics > 0) - set_SRU_error(c, &res->diagnostics[0]); - nmem = odr_extract_mem(c->odr_in); - nmem_transfer(odr_getmem(resultset->odr), nmem); - nmem_destroy(nmem); + return zoom_complete; } #endif @@ -3949,6 +4114,7 @@ static void handle_srw_scan_response(ZOOM_connection c, #if YAZ_HAVE_XML2 static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres) { + zoom_ret cret = zoom_complete; int ret = -1; const char *addinfo = 0; const char *connection_head = z_HTTP_header_lookup(hres->headers, @@ -3976,7 +4142,7 @@ static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres) ZOOM_options_set(c->options, "sru_version", sr->srw_version); if (sr->which == Z_SRW_searchRetrieve_response) - handle_srw_response(c, sr->u.response); + cret = handle_srw_response(c, sr->u.response); else if (sr->which == Z_SRW_scan_response) handle_srw_scan_response(c, sr->u.scan_response); else @@ -4000,7 +4166,8 @@ static void handle_http(ZOOM_connection c, Z_HTTP_Response *hres) set_ZOOM_error(c, ZOOM_ERROR_DECODE, addinfo); do_close(c); } - ZOOM_connection_remove_task(c); + if (cret == zoom_complete) + ZOOM_connection_remove_task(c); if (!strcmp(hres->version, "1.0")) { /* HTTP 1.0: only if Keep-Alive we stay alive.. */ @@ -4066,16 +4233,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; }