* Copyright (c) 2000-2003, Index Data
* See the file LICENSE for details.
*
- * $Id: zoom-c.c,v 1.13 2003-01-06 08:20:29 adam Exp $
+ * $Id: zoom-c.c,v 1.17 2003-02-12 15:06:44 adam Exp $
*
* ZOOM layer for C, connections, result sets, queries.
*/
ZOOM_query_cql(ZOOM_query s, const char *str)
{
Z_External *ext;
- char *buf;
- int len;
ext = (Z_External *) odr_malloc(s->odr, sizeof(*ext));
ext->direct_reference = odr_getoidbystr(s->odr, "1.2.840.10003.16.2");
{
/* Regular piggyback - do it unless we're going to do sort */
*search_req->largeSetLowerBound = 2000000000;
- *search_req->smallSetUpperBound = r->count;
+ *search_req->smallSetUpperBound = 0;
*search_req->mediumSetPresentNumber = r->count;
- smallSetElementSetName = 0; /* no need to provide this */
+ smallSetElementSetName = 0;
}
else
{
compo->u.complex->generic = (Z_Specification *)
odr_malloc(c->odr_out, sizeof(*compo->u.complex->generic));
- compo->u.complex->generic->schema = (Odr_oid *)
+ compo->u.complex->generic->which = Z_Specification_oid;
+ compo->u.complex->generic->u.oid = (Odr_oid *)
yaz_str_to_z3950oid (c->odr_out, CLASS_SCHEMA, schema);
- if (!compo->u.complex->generic->schema)
+ if (!compo->u.complex->generic->u.oid)
{
/* OID wasn't a schema! Try record syntax instead. */
- compo->u.complex->generic->schema = (Odr_oid *)
+ compo->u.complex->generic->u.oid = (Odr_oid *)
yaz_str_to_z3950oid (c->odr_out, CLASS_RECSYN, schema);
}
if (elementSetName && *elementSetName)
{
ZOOM_Event event = ZOOM_Event_create(ZOOM_EVENT_TIMEOUT);
/* timeout and this connection was waiting */
- set_ZOOM_error(c, ZOOM_ERROR_TIMEOUT);
+ set_ZOOM_error(c, ZOOM_ERROR_TIMEOUT, 0);
do_close (c);
yaz_log (LOG_DEBUG, "timeout");
ZOOM_connection_put_event(c, event);