* Copyright (c) 1995-2003, Index Data
* See the file LICENSE for details.
*
- * $Id: seshigh.c,v 1.152 2003-03-25 09:55:11 adam Exp $
+ * $Id: seshigh.c,v 1.159 2003-05-24 19:34:43 adam Exp $
*/
/*
odr_setbuf(assoc->decode, assoc->input_buffer, res, 0);
if (!z_GDU(assoc->decode, &req->gdu_request, 0, 0))
{
- yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
+ yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [element %s] "
+ "[near byte %d] ",
odr_errmsg(odr_geterror(assoc->decode)),
+ odr_getelement(assoc->decode),
odr_offset(assoc->decode));
if (assoc->decode->error != OHTTP)
{
rr.errcode = 0;
rr.errstring = 0;
rr.surrogate_flag = 0;
+ rr.schema = srw_req->recordSchema;
if (!assoc->init->bend_fetch)
return 1;
record->recordData_buf = rr.record;
record->recordData_len = rr.len;
record->recordPosition = odr_intdup(o, pos);
- record->recordSchema = 0;
- if (srw_req->recordSchema)
- record->recordSchema = odr_strdup(o, srw_req->recordSchema);
+ if (rr.schema)
+ record->recordSchema = odr_strdup(o, rr.schema);
+ else
+ record->recordSchema = 0;
}
return rr.errcode;
}
yaz_diag_bib1_to_srw (rr.errcode));
srw_res->diagnostics[0].details = rr.errstring;
yaz_log(LOG_DEBUG, "srw_bend_search returned SRW error %d",
- srw_res->diagnostics[0].code);
+ *srw_res->diagnostics[0].code);
}
else
{
+ int number = srw_req->maximumRecords ? *srw_req->maximumRecords : 0;
+ int start = srw_req->startRecord ? *srw_req->startRecord : 1;
+
+ yaz_log(LOG_LOG, "Request to pack %d+%d out of %d",
+ start, number, rr.hits);
+
srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits);
- if (srw_req->maximumRecords && *srw_req->maximumRecords > 0)
+ if (number > 0)
{
- int number = *srw_req->maximumRecords;
- int start = 1;
int i;
- if (srw_req->startRecord)
- start = *srw_req->startRecord;
-
- yaz_log(LOG_DEBUG, "srw_bend_search. start=%d max=%d",
- start, *srw_req->maximumRecords);
-
- if (start <= rr.hits)
+ if (start > rr.hits)
+ {
+ yaz_log(LOG_LOG, "Request out or range");
+ }
+ else
{
int j = 0;
int packing = Z_SRW_recordPacking_string;
const char *p1 = strchr(path, '=');
if (!p1)
break;
- if (p1 - path == nlen && !memcmp(path, name, nlen))
+ if ((size_t)(p1 - path) == nlen && !memcmp(path, name, nlen))
{
size_t i = 0;
char *ret;
if (!strcmp(hreq->method, "GET"))
{
- char *charset = 0;
- int ret = -1;
- Z_SOAP *soap_package = 0;
char *db = "Default";
const char *p0 = hreq->path, *p1;
- static Z_SOAP_Handler soap_handlers[2] = {
#if HAVE_XML2
+ int ret = -1;
+ char *charset = 0;
+ Z_SOAP *soap_package = 0;
+ static Z_SOAP_Handler soap_handlers[2] = {
{"http://www.loc.gov/zing/srw/v1.0/", 0,
(Z_SOAP_fun) yaz_srw_codec},
-#endif
{0, 0, 0}
};
+#endif
if (*p0 == '/')
p0++;
}
sr->u.request->recordSchema = uri_val(p1, "recordSchema", o);
sr->u.request->recordPacking = uri_val(p1, "recordPacking", o);
+ if (!sr->u.request->recordPacking)
+ sr->u.request->recordPacking = "xml";
uri_val_int(p1, "maximumRecords", o,
&sr->u.request->maximumRecords);
uri_val_int(p1, "startRecord", o,
}
if (!z_GDU(assoc->encode, &res, 0, 0))
{
- yaz_log(LOG_WARN, "ODR error when encoding response: %s",
- odr_errmsg(odr_geterror(assoc->decode)));
+ yaz_log(LOG_WARN, "ODR error when decoding PDU: %s [element %s]",
+ odr_errmsg(odr_geterror(assoc->decode)),
+ odr_getelement(assoc->decode));
return -1;
}
req->response = odr_getbuf(assoc->encode, &req->len_response,
freq.output_format_raw = 0;
freq.stream = a->encode;
freq.print = a->print;
- freq.surrogate_flag = 0;
freq.referenceId = referenceId;
+ freq.schema = 0;
(*a->init->bend_fetch)(a->backend, &freq);
/* backend should be able to signal whether error is system-wide
or only pertaining to current record */
oident *attset;
bend_scan_rr *bsrr = (bend_scan_rr *)
odr_malloc (assoc->encode, sizeof(*bsrr));
+ struct scan_entry *save_entries;
yaz_log(LOG_LOG, "Got ScanRequest");
bsrr->stream = assoc->encode;
bsrr->print = assoc->print;
bsrr->step_size = res->stepSize;
+ bsrr->entries = 0;
+ /* Note that version 2.0 of YAZ and older did not set entries ..
+ We do now. And when we do it's easier to extend the scan entry
+ We know that if the scan handler did set entries, it will
+ not know of new member display_term.
+ */
+ if (bsrr->num_entries > 0)
+ {
+ int i;
+ bsrr->entries = odr_malloc(assoc->decode, sizeof(*bsrr->entries) *
+ bsrr->num_entries);
+ for (i = 0; i<bsrr->num_entries; i++)
+ {
+ bsrr->entries[i].term = 0;
+ bsrr->entries[i].occurrences = 0;
+ bsrr->entries[i].errcode = 0;
+ bsrr->entries[i].errstring = 0;
+ bsrr->entries[i].display_term = 0;
+ }
+ }
+ save_entries = bsrr->entries; /* save it so we can compare later */
+
if (req->attributeSet &&
(attset = oid_getentbyoid(req->attributeSet)) &&
(attset->oclass == CLASS_ATTSET || attset->oclass == CLASS_GENERAL))
odr_malloc(assoc->encode, sizeof(*t));
t->suggestedAttributes = 0;
t->displayTerm = 0;
+ if (save_entries == bsrr->entries &&
+ bsrr->entries[i].display_term)
+ {
+ /* the entries was NOT set by the handler. So it's
+ safe to test for new member display_term. It is
+ NULL'ed by us.
+ */
+ t->displayTerm = odr_strdup(assoc->encode,
+ bsrr->entries[i].display_term);
+ }
t->alternativeTerm = 0;
t->byAttributes = 0;
t->otherTermInfo = 0;