X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fproto.c;h=9bcdde78d882a7203be290697e2dcaa2cd2fd0f3;hp=5324a7094e478e3756cf91201e07f391ce597a27;hb=a807bde38544a7aa45dd2988e504a1acb3fd30c0;hpb=711159f51111a2f1de5343bfdbd56a0e41d42baf diff --git a/asn/proto.c b/asn/proto.c index 5324a70..9bcdde7 100644 --- a/asn/proto.c +++ b/asn/proto.c @@ -1,10 +1,19 @@ - /* +/* * Copyright (c) 1995, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: proto.c,v $ - * Revision 1.51 1996-07-26 14:07:21 quinn + * Revision 1.54 1996-11-11 13:14:46 adam + * Fixed tagging bug in z_ProximityOperator. + * + * Revision 1.53 1996/10/09 15:54:55 quinn + * Added SearchInfoReport + * + * 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 @@ -639,7 +648,7 @@ int z_ProximityOperator(ODR o, Z_ProximityOperator **p, int opt) static Odr_arm arm[] = { {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ProxCode_known, odr_integer}, - {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ProxCode_private, odr_integer}, + {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ProxCode_private, odr_integer}, {-1, -1, -1, -1, 0} }; @@ -751,7 +760,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} }; @@ -1480,7 +1489,7 @@ int z_DeleteResultSetRequest(ODR o, Z_DeleteResultSetRequest **p, int opt) z_ReferenceId(o, &(*p)->referenceId, 1) && odr_implicit(o, odr_integer, &(*p)->deleteFunction, ODR_CONTEXT, 32, 0) && - (odr_sequence_of(o, z_ListStatus, &(*p)->resultSetList, + (odr_sequence_of(o, z_ResultSetId, &(*p)->resultSetList, &(*p)->num_ids) || odr_ok(o)) && #ifdef Z_95 z_OtherInformation(o, &(*p)->otherInfo, 1) &&