* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: seshigh.c,v 1.83 2006-05-30 04:01:55 quinn Exp $
+ * $Id: seshigh.c,v 1.87 2006-06-20 21:20:51 adam Exp $
*/
/**
* \file seshigh.c
bprr->start = start;
bprr->number = number;
bprr->format = VAL_TEXT_XML;
- bprr->comp = (Z_RecordComposition *) odr_malloc(assoc->decode,
- sizeof(*bprr->comp));
- bprr->comp->which = Z_RecordComp_complex;
- bprr->comp->u.complex = (Z_CompSpec *) odr_malloc(assoc->decode,
- sizeof(Z_CompSpec));
- bprr->comp->u.complex->selectAlternativeSyntax = (bool_t *)
- odr_malloc(assoc->decode, sizeof(bool_t));
- *bprr->comp->u.complex->selectAlternativeSyntax = 0;
- bprr->comp->u.complex->num_dbSpecific = 0;
- bprr->comp->u.complex->dbSpecific = 0;
- bprr->comp->u.complex->num_recordSyntax = 0;
- bprr->comp->u.complex->recordSyntax = 0;
- bprr->comp->u.complex->generic = (Z_Specification *)
- odr_malloc(assoc->decode, sizeof(Z_Specification));
- bprr->comp->u.complex->generic->which = Z_Schema_uri;
- bprr->comp->u.complex->generic->schema.uri = srw_req->recordSchema;
- bprr->comp->u.complex->generic->elementSpec = 0;
if (srw_req->recordSchema)
{
- bprr->comp->u.complex->generic->elementSpec =
- (Z_ElementSpec *) odr_malloc(assoc->decode,
- sizeof(Z_ElementSpec));
- bprr->comp->u.complex->generic->elementSpec->which =
- Z_ElementSpec_elementSetName;
- bprr->comp->u.complex->generic->elementSpec->u.elementSetName =
- srw_req->recordSchema;
+ bprr->comp = (Z_RecordComposition *) odr_malloc(assoc->decode,
+ sizeof(*bprr->comp));
+ bprr->comp->which = Z_RecordComp_simple;
+ bprr->comp->u.simple = (Z_ElementSetNames *)
+ odr_malloc(assoc->decode, sizeof(Z_ElementSetNames));
+ bprr->comp->u.simple->which = Z_ElementSetNames_generic;
+ bprr->comp->u.simple->u.generic = srw_req->recordSchema;
+ }
+ else
+ {
+ bprr->comp = 0;
}
bprr->stream = assoc->encode;
bprr->referenceId = 0;
return;
if (bprr->errcode)
{
- srw_error = yaz_diag_bib1_to_srw (rr.errcode);
+ srw_error = yaz_diag_bib1_to_srw (bprr->errcode);
yaz_add_srw_diagnostic(assoc->encode,
&srw_res->diagnostics,
&srw_res->num_diagnostics,
- srw_error, rr.errstring);
+ srw_error, bprr->errstring);
ok = 0;
}
}
rr.response_extra_record = 0;
rr.extra_request_data = 0;
rr.extra_response_data = 0;
- rr.errcode = 0;
- rr.errstring = 0;
+ rr.uri = 0;
+ rr.message = 0;
+ rr.details = 0;
yaz_log(YLOG_DEBUG, "basename = %s", rr.basenames[0] );
yaz_log(YLOG_DEBUG, "Operation = %s", rr.operation );
}
else if ( !strcmp( rr.operation, "insert" ) )
{
+ rr.record_id = srw_req->recordId;
if ( srw_req->record.recordSchema == 0 ){
yaz_add_srw_diagnostic(assoc->encode, &srw_res->diagnostics,
&srw_res->num_diagnostics,
return;
}
}
- if (rr.errcode)
- yaz_add_srw_diagnostic(assoc->encode,
- &srw_res->diagnostics,
- &srw_res->num_diagnostics,
- rr.errcode, rr.errstring);
+
+ if (rr.uri)
+ yaz_add_srw_diagnostic_uri(assoc->encode,
+ &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ rr.uri,
+ rr.message,
+ rr.details);
srw_res->recordId = rr.record_id;
srw_res->operationStatus = rr.operation_status;
srw_res->recordVersion = rr.record_version;
strcat(options, " negotiation");
}
- ODR_MASK_SET(resp->options, Z_Options_triggerResourceCtrl);
+ if (ODR_MASK_GET(req->options, Z_Options_triggerResourceCtrl))
+ ODR_MASK_SET(resp->options, Z_Options_triggerResourceCtrl);
if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
{
assoc->init->implementation_name,
odr_prepend(assoc->encode, "GFS", resp->implementationName));
- version = odr_strdup(assoc->encode, "$Revision: 1.83 $");
+ version = odr_strdup(assoc->encode, "$Revision: 1.87 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
resp->implementationVersion = odr_prepend(assoc->encode,