X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fproto.c;h=d77f2676f394f675476a0de9fd9e8ff178b1a1d6;hp=53791b3f809b7a97e5e709565634113e217fd468;hb=78909a91319d7274a6c0f896d25c909d071742aa;hpb=bf6c973ee6b5864bdb95d7d953fdcac75ea1b060 diff --git a/asn/proto.c b/asn/proto.c index 53791b3..d77f267 100644 --- a/asn/proto.c +++ b/asn/proto.c @@ -1,10 +1,22 @@ -/* + /* * Copyright (c) 1995, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: proto.c,v $ - * Revision 1.48 1996-06-10 08:53:33 quinn + * Revision 1.52 1996-10-08 12:56:57 adam + * Bug fix: tagging of type 101 query. + * + * Revision 1.51 1996/07/26 14:07:21 quinn + * Small + * + * Revision 1.50 1996/07/26 13:36:15 quinn + * Various smallish + * + * Revision 1.49 1996/07/06 19:58:28 quinn + * System headerfiles gathered in yconfig + * + * Revision 1.48 1996/06/10 08:53:33 quinn * Added Summary,OPAC,ResourceReport * * Revision 1.47 1996/05/29 15:47:50 quinn @@ -274,7 +286,7 @@ int z_Unit(ODR o, Z_Unit **p, int opt) if (!odr_sequence_begin(o, p, sizeof(**p))) return opt && odr_ok(o); return - odr_explicit(o, odr_visiblestring, &(*p)->unitSystem, ODR_CONTEXT, + odr_explicit(o, z_InternationalString, &(*p)->unitSystem, ODR_CONTEXT, 1, 1) && odr_explicit(o, z_StringOrNumeric, &(*p)->unitType, ODR_CONTEXT, 2, 1) && @@ -742,7 +754,7 @@ int z_Query(ODR o, Z_Query **p, int opt) { {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Query_type_1, z_RPNQuery}, {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_Query_type_2, odr_octetstring}, - {ODR_EXPLICIT, ODR_CONTEXT, 101, Z_Query_type_101, z_RPNQuery}, + {ODR_IMPLICIT, ODR_CONTEXT, 101, Z_Query_type_101, z_RPNQuery}, {-1, -1, -1, -1, 0} }; @@ -1759,7 +1771,7 @@ int z_ResourceReportResponse(ODR o, Z_ResourceReportResponse **p, int opt) z_ReferenceId(o, &(*p)->referenceId, 1) && odr_implicit(o, odr_integer, &(*p)->resourceReportStatus, ODR_CONTEXT, 50, 0) && - odr_implicit(o, z_External, &(*p)->resourceReport, ODR_CONTEXT, + odr_explicit(o, z_External, &(*p)->resourceReport, ODR_CONTEXT, 51, 1) && z_OtherInformation(o, &(*p)->otherInfo, 1) && odr_sequence_end(o); @@ -1814,6 +1826,7 @@ int z_APDU(ODR o, Z_APDU **p, int opt) if (o->direction == ODR_DECODE) *p = odr_malloc(o, sizeof(**p)); + odr_setlenlen(o, 5); if (!odr_choice(o, arm, &(*p)->u, &(*p)->which)) { if (o->direction == ODR_DECODE)