X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=client%2Fclient.c;h=cd973bd3b6a62eaf9bfe3c2bae551ca1116ed69d;hb=db585d7fcb8319fa86543eb062df7fdaf16858c6;hp=ddeacaf5b1e06c7f571f7ae4f23ff301a7baa471;hpb=c620a713f1418315efcd4e6fab225e036775d365;p=yaz-moved-to-github.git diff --git a/client/client.c b/client/client.c index ddeacaf..cd973bd 100644 --- a/client/client.c +++ b/client/client.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * - * $Id: client.c,v 1.180 2003-02-12 15:06:43 adam Exp $ + * $Id: client.c,v 1.182 2003-02-17 21:23:31 adam Exp $ */ #include @@ -966,7 +966,7 @@ static int send_searchRequest(char *arg) break; case QueryType_CQL: query.which = Z_Query_type_104; - ext = odr_malloc(out, sizeof(*ext)); + ext = (Z_External *) odr_malloc(out, sizeof(*ext)); ext->direct_reference = odr_getoidbystr(out, "1.2.840.10003.16.2"); ext->indirect_reference = 0; ext->descriptor = 0; @@ -1788,14 +1788,14 @@ static int send_presentRequest(char *arg) compo.u.complex->generic = (Z_Specification *) odr_malloc(out, sizeof(*compo.u.complex->generic)); - compo.u.complex->generic->which = Z_Specification_oid; - compo.u.complex->generic->u.oid = (Odr_oid *) + compo.u.complex->generic->which = Z_Schema_oid; + compo.u.complex->generic->schema.oid = (Odr_oid *) odr_oiddup(out, oid_ent_to_oid(&prefschema, oid)); - if (!compo.u.complex->generic->u.oid) + if (!compo.u.complex->generic->schema.oid) { /* OID wasn't a schema! Try record syntax instead. */ prefschema.oclass = CLASS_RECSYN; - compo.u.complex->generic->u.oid = (Odr_oid *) + compo.u.complex->generic->schema.oid = (Odr_oid *) odr_oiddup(out, oid_ent_to_oid(&prefschema, oid)); } if (!elementSetNames)