* Copyright (C) 1995-2005, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: seshigh.c,v 1.81 2006-05-13 03:56:31 quinn Exp $
+ * $Id: seshigh.c,v 1.86 2006-06-15 12:53:58 adam Exp $
*/
/**
* \file seshigh.c
const char *match_schema = 0;
int *match_syntax = 0;
- if (!assoc->server)
- {
- yaz_log(YLOG_LOG, "no assoc->server");
- }
if (assoc->server)
{
int r;
const char *backend_schema = 0;
Odr_oid *backend_syntax = 0;
- yaz_log(YLOG_LOG, "found assoc->server");
-
r = yaz_retrieval_request(assoc->server->retrieval,
input_schema,
input_syntax_raw,
&rc,
&backend_schema,
&backend_syntax);
- yaz_log(YLOG_LOG, "yaz_retrieval_request r=%d", r);
if (r == -1) /* error ? */
{
const char *details = yaz_retrieval_get_error(
rr->output_format = oi ? oi->value : VAL_NONE;
rr->output_format_raw = match_syntax;
}
- yaz_log(YLOG_LOG, "match_scheam=%s", match_schema);
if (match_schema)
rr->schema = odr_strdup(rr->stream, match_schema);
return 0;
}
else
{
- int j = 0;
- int packing = Z_SRW_recordPacking_string;
+ int ok = 1;
if (start + number > rr.hits)
number = rr.hits - start + 1;
- if (srw_req->recordPacking){
- if (!strcmp(srw_req->recordPacking, "xml"))
- packing = Z_SRW_recordPacking_XML;
- if (!strcmp(srw_req->recordPacking, "url"))
- packing = Z_SRW_recordPacking_URL;
- }
- srw_res->records = (Z_SRW_record *)
- odr_malloc(assoc->encode,
- number * sizeof(*srw_res->records));
-
- srw_res->extra_records = (Z_SRW_extra_record **)
- odr_malloc(assoc->encode,
- number*sizeof(*srw_res->extra_records));
-
- for (i = 0; i<number; i++)
+
+ /* Call bend_present if defined */
+ if (assoc->init->bend_present)
{
- int errcode;
+ bend_present_rr *bprr = (bend_present_rr*)
+ odr_malloc (assoc->decode, sizeof(*bprr));
+ bprr->setname = "default";
+ bprr->start = start;
+ bprr->number = number;
+ bprr->format = VAL_TEXT_XML;
+ if (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;
+ bprr->print = assoc->print;
+ bprr->request = req;
+ bprr->association = assoc;
+ bprr->errcode = 0;
+ bprr->errstring = NULL;
+ (*assoc->init->bend_present)(assoc->backend, bprr);
- srw_res->records[j].recordPacking = packing;
- srw_res->records[j].recordData_buf = 0;
- srw_res->extra_records[j] = 0;
- yaz_log(YLOG_DEBUG, "srw_bend_fetch %d", i+start);
- errcode = srw_bend_fetch(assoc, i+start, srw_req,
- srw_res->records + j);
- if (errcode)
+ if (!bprr->request)
+ return;
+ if (bprr->errcode)
{
+ srw_error = yaz_diag_bib1_to_srw (bprr->errcode);
yaz_add_srw_diagnostic(assoc->encode,
&srw_res->diagnostics,
&srw_res->num_diagnostics,
- yaz_diag_bib1_to_srw (errcode),
- rr.errstring);
+ srw_error, bprr->errstring);
+ ok = 0;
+ }
+ }
+
+ if (ok)
+ {
+ int j = 0;
+ int packing = Z_SRW_recordPacking_string;
+ if (srw_req->recordPacking){
+ if (!strcmp(srw_req->recordPacking, "xml"))
+ packing = Z_SRW_recordPacking_XML;
+ if (!strcmp(srw_req->recordPacking, "url"))
+ packing = Z_SRW_recordPacking_URL;
+ }
+ srw_res->records = (Z_SRW_record *)
+ odr_malloc(assoc->encode,
+ number * sizeof(*srw_res->records));
+
+ srw_res->extra_records = (Z_SRW_extra_record **)
+ odr_malloc(assoc->encode,
+ number*sizeof(*srw_res->extra_records));
+
+ for (i = 0; i<number; i++)
+ {
+ int errcode;
- break;
+ srw_res->records[j].recordPacking = packing;
+ srw_res->records[j].recordData_buf = 0;
+ srw_res->extra_records[j] = 0;
+ yaz_log(YLOG_DEBUG, "srw_bend_fetch %d", i+start);
+ errcode = srw_bend_fetch(assoc, i+start, srw_req,
+ srw_res->records + j);
+ if (errcode)
+ {
+ yaz_add_srw_diagnostic(assoc->encode,
+ &srw_res->diagnostics,
+ &srw_res->num_diagnostics,
+ yaz_diag_bib1_to_srw (errcode),
+ rr.errstring);
+
+ break;
+ }
+ if (srw_res->records[j].recordData_buf)
+ j++;
}
- if (srw_res->records[j].recordData_buf)
- j++;
+ srw_res->num_records = j;
+ if (!j)
+ srw_res->records = 0;
}
- srw_res->num_records = j;
- if (!j)
- srw_res->records = 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;
assoc->init->implementation_name,
odr_prepend(assoc->encode, "GFS", resp->implementationName));
- version = odr_strdup(assoc->encode, "$Revision: 1.81 $");
+ version = odr_strdup(assoc->encode, "$Revision: 1.86 $");
if (strlen(version) > 10) /* check for unexpanded CVS strings */
version[strlen(version)-2] = '\0';
resp->implementationVersion = odr_prepend(assoc->encode,