X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fprt-grs.c;h=1c4db43994b84608919fff18eff260a9e25c9b45;hp=08c5ca6cae9705bc576d26f7feb3e33a04f86654;hb=8d363b42a1805306b5df26aac694a4491d5c9119;hpb=bf4149c63ad2e11429e302a89f472de52b4d7ce8 diff --git a/asn/prt-grs.c b/asn/prt-grs.c index 08c5ca6..1c4db43 100644 --- a/asn/prt-grs.c +++ b/asn/prt-grs.c @@ -1,10 +1,17 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-1999, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: prt-grs.c,v $ - * Revision 1.6 1997-05-14 06:53:23 adam + * Revision 1.8 1999-04-20 09:56:48 adam + * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun). + * Modified all encoders/decoders to reflect this change. + * + * Revision 1.7 1998/02/11 11:53:32 adam + * Changed code so that it compiles as C++. + * + * Revision 1.6 1997/05/14 06:53:23 adam * C++ support. * * Revision 1.5 1995/10/18 16:12:20 quinn @@ -27,126 +34,151 @@ #include -int z_TaggedElement(ODR o, Z_TaggedElement **p, int opt); -int z_ElementData(ODR o, Z_ElementData **p, int opt); -int z_ElementMetaData(ODR o, Z_ElementMetaData **p, int opt); -int z_TagUnit(ODR o, Z_TagUnit **p, int opt); -int z_TagPath(ODR o, Z_TagPath **p, int opt); -int z_Order(ODR o, Z_Order **p, int opt); -int z_Usage(ODR o, Z_Usage **p, int opt); -int z_HitVector(ODR o, Z_HitVector **p, int opt); -int z_Triple(ODR o, Z_Triple **p, int opt); -int z_Variant(ODR o, Z_Variant **p, int opt); +int z_TaggedElement(ODR o, Z_TaggedElement **p, int opt, const char *name); +int z_ElementData(ODR o, Z_ElementData **p, int opt, const char *name); +int z_ElementMetaData(ODR o, Z_ElementMetaData **p, int opt, const char *name); +int z_TagUnit(ODR o, Z_TagUnit **p, int opt, const char *name); +int z_TagPath(ODR o, Z_TagPath **p, int opt, const char *name); +int z_Order(ODR o, Z_Order **p, int opt, const char *name); +int z_Usage(ODR o, Z_Usage **p, int opt, const char *name); +int z_HitVector(ODR o, Z_HitVector **p, int opt, const char *name); +int z_Triple(ODR o, Z_Triple **p, int opt, const char *name); +int z_Variant(ODR o, Z_Variant **p, int opt, const char *name); -int z_GenericRecord(ODR o, Z_GenericRecord **p, int opt) +int z_GenericRecord(ODR o, Z_GenericRecord **p, int opt, const char *name) { if (o->direction == ODR_DECODE) - *p = odr_malloc(o, sizeof(**p)); + *p = (Z_GenericRecord *)odr_malloc(o, sizeof(**p)); else if (!*p) return opt; - if (odr_sequence_of(o, z_TaggedElement, &(*p)->elements, &(*p)->num_elements)) + if (odr_sequence_of(o, (Odr_fun)z_TaggedElement, &(*p)->elements, + &(*p)->num_elements, 0)) return 1; *p = 0; return opt && odr_ok(o); } -int z_TaggedElement(ODR o, Z_TaggedElement **p, int opt) +int z_TaggedElement(ODR o, Z_TaggedElement **p, int opt, const char *name) { - if (!odr_sequence_begin(o, p, sizeof(**p))) + if (!odr_sequence_begin(o, p, sizeof(**p), 0)) return opt && odr_ok(o); return - odr_implicit(o, odr_integer, &(*p)->tagType, ODR_CONTEXT, 1, 1) && - odr_explicit(o, z_StringOrNumeric, &(*p)->tagValue, ODR_CONTEXT, 2, 0) && - odr_implicit(o, odr_integer, &(*p)->tagOccurrence, ODR_CONTEXT, 3, 1) && - odr_explicit(o, z_ElementData, &(*p)->content, ODR_CONTEXT, 4, 0) && - odr_implicit(o, z_ElementMetaData, &(*p)->metaData, ODR_CONTEXT, 5, 1) && + odr_implicit(o, odr_integer, &(*p)->tagType, + ODR_CONTEXT, 1, 1) && + odr_explicit(o, z_StringOrNumeric, &(*p)->tagValue, + ODR_CONTEXT, 2, 0) && + odr_implicit(o, odr_integer, &(*p)->tagOccurrence, + ODR_CONTEXT, 3, 1) && + odr_explicit(o, z_ElementData, &(*p)->content, + ODR_CONTEXT, 4, 0) && + odr_implicit(o, z_ElementMetaData, &(*p)->metaData, + ODR_CONTEXT, 5, 1) && odr_implicit(o, z_Variant, &(*p)->appliedVariant, ODR_CONTEXT, 6, 1) && odr_sequence_end(o); } - -int z_ElementData(ODR o, Z_ElementData **p, int opt) + +int z_ElementData(ODR o, Z_ElementData **p, int opt, const char *name) { static Odr_arm arm[] = { - {ODR_NONE, -1, -1, Z_ElementData_octets, odr_octetstring}, - {ODR_NONE, -1, -1, Z_ElementData_numeric, odr_integer}, - {ODR_NONE, -1, -1, Z_ElementData_date, odr_generalizedtime}, - {ODR_NONE, -1, -1, Z_ElementData_ext, z_External}, - {ODR_NONE, -1, -1, Z_ElementData_string, z_InternationalString}, + {ODR_NONE, -1, -1, Z_ElementData_octets, + (Odr_fun)odr_octetstring, 0}, + {ODR_NONE, -1, -1, Z_ElementData_numeric, + (Odr_fun)odr_integer, 0}, + {ODR_NONE, -1, -1, Z_ElementData_date, + (Odr_fun)odr_generalizedtime, 0}, + {ODR_NONE, -1, -1, Z_ElementData_ext, + (Odr_fun)z_External, 0}, + {ODR_NONE, -1, -1, Z_ElementData_string, + (Odr_fun)z_InternationalString, 0}, /* The entry below provides some backwards compatibility */ - {ODR_NONE, -1, -1, Z_ElementData_string, odr_visiblestring}, - {ODR_NONE, -1, -1, Z_ElementData_trueOrFalse, odr_bool}, - {ODR_NONE, -1, -1, Z_ElementData_oid, odr_oid}, - {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementData_intUnit, z_IntUnit}, - {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ElementData_elementNotThere, odr_null}, - {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ElementData_elementEmpty, odr_null}, - {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_ElementData_noDataRequested, odr_null}, - {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_ElementData_diagnostic, z_External}, - {ODR_EXPLICIT, ODR_CONTEXT, 6, Z_ElementData_subtree, z_GenericRecord}, - {-1, -1, -1, -1, 0} + {ODR_NONE, -1, -1, Z_ElementData_string, + (Odr_fun)odr_visiblestring, 0}, + {ODR_NONE, -1, -1, Z_ElementData_trueOrFalse, + (Odr_fun)odr_bool, 0}, + {ODR_NONE, -1, -1, Z_ElementData_oid, + (Odr_fun)odr_oid, 0}, + {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementData_intUnit, + (Odr_fun)z_IntUnit, 0}, + {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ElementData_elementNotThere, + (Odr_fun)odr_null, 0}, + {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_ElementData_elementEmpty, + (Odr_fun)odr_null, 0}, + {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_ElementData_noDataRequested, + (Odr_fun)odr_null, 0}, + {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_ElementData_diagnostic, + (Odr_fun)z_External, 0}, + {ODR_EXPLICIT, ODR_CONTEXT, 6, Z_ElementData_subtree, + (Odr_fun)z_GenericRecord, 0}, + {-1, -1, -1, -1, 0, 0} }; if (o->direction == ODR_DECODE) - *p = odr_malloc(o, sizeof(**p)); + *p = (Z_ElementData *)odr_malloc(o, sizeof(**p)); else if (!*p) return opt; - if (odr_choice(o, arm, &(*p)->u, &(*p)->which)) + if (odr_choice(o, arm, &(*p)->u, &(*p)->which, 0)) return 1; *p = 0; return opt && odr_ok(o); } -int z_ElementMetaData(ODR o, Z_ElementMetaData **p, int opt) +int z_ElementMetaData(ODR o, Z_ElementMetaData **p, int opt, const char *name) { - if (!odr_sequence_begin(o, p, sizeof(**p))) + if (!odr_sequence_begin(o, p, sizeof(**p), 0)) return opt && odr_ok(o); return odr_implicit(o, z_Order, &(*p)->seriesOrder, ODR_CONTEXT, 1, 1) && odr_implicit(o, z_Usage, &(*p)->usageRight, ODR_CONTEXT, 2, 1) && odr_implicit_settag(o, ODR_CONTEXT, 3) && - (odr_sequence_of(o, z_HitVector, &(*p)->hits, &(*p)->num_hits) || - odr_ok(o)) && - odr_implicit(o, z_InternationalString, &(*p)->displayName, ODR_CONTEXT, - 4, 1) && + (odr_sequence_of(o, (Odr_fun)z_HitVector, &(*p)->hits, + &(*p)->num_hits, 0) || + odr_ok(o)) && + odr_implicit(o, z_InternationalString, &(*p)->displayName, + ODR_CONTEXT, 4, 1) && odr_implicit_settag(o, ODR_CONTEXT, 5) && - (odr_sequence_of(o, z_Variant, &(*p)->supportedVariants, - &(*p)->num_supportedVariants) || odr_ok(o)) && - odr_implicit(o, z_InternationalString, &(*p)->message, ODR_CONTEXT, - 6, 1) && - odr_implicit(o, odr_octetstring, &(*p)->elementDescriptor, ODR_CONTEXT, - 7, 1) && + (odr_sequence_of(o, (Odr_fun)z_Variant, &(*p)->supportedVariants, + &(*p)->num_supportedVariants, 0) || odr_ok(o)) && + odr_implicit(o, z_InternationalString, &(*p)->message, + ODR_CONTEXT, 6, 1) && + odr_implicit(o, odr_octetstring, &(*p)->elementDescriptor, + ODR_CONTEXT, 7, 1) && odr_implicit(o, z_TagPath, &(*p)->surrogateFor, ODR_CONTEXT, 8, 1) && - odr_implicit(o, z_TagPath, &(*p)->surrogateElement, ODR_CONTEXT, 9, 1) && + odr_implicit(o, z_TagPath, &(*p)->surrogateElement, + ODR_CONTEXT, 9, 1) && odr_implicit(o, z_External, &(*p)->other, ODR_CONTEXT, 99, 1) && odr_sequence_end(o); } -int z_TagUnit(ODR o, Z_TagUnit **p, int opt) +int z_TagUnit(ODR o, Z_TagUnit **p, int opt, const char *name) { - if (!odr_sequence_begin(o, p, sizeof(**p))) + if (!odr_sequence_begin(o, p, sizeof(**p), 0)) return opt && odr_ok(o); return odr_implicit(o, odr_integer, &(*p)->tagType, ODR_CONTEXT, 1, 1) && - odr_explicit(o, z_StringOrNumeric, &(*p)->tagValue, ODR_CONTEXT, 2, 0) && - odr_implicit(o, odr_integer, &(*p)->tagOccurrence, ODR_CONTEXT, 3, 1) && + odr_explicit(o, z_StringOrNumeric, &(*p)->tagValue, + ODR_CONTEXT, 2, 0) && + odr_implicit(o, odr_integer, &(*p)->tagOccurrence, + ODR_CONTEXT, 3, 1) && odr_sequence_end(o); } -int z_TagPath(ODR o, Z_TagPath **p, int opt) +int z_TagPath(ODR o, Z_TagPath **p, int opt, const char *name) { if (o->direction == ODR_DECODE) - *p = odr_malloc(o, sizeof(**p)); + *p = (Z_TagPath *)odr_malloc(o, sizeof(**p)); else if (!*p) return opt; - if (odr_sequence_of(o, z_TagUnit, &(*p)->tags, &(*p)->num_tags)) + if (odr_sequence_of(o, (Odr_fun)z_TagUnit, &(*p)->tags, + &(*p)->num_tags, 0)) return 1; *p = 0; return opt && odr_ok(o); } -int z_Order(ODR o, Z_Order **p, int opt) +int z_Order(ODR o, Z_Order **p, int opt, const char *name) { - if (!odr_sequence_begin(o, p, sizeof(**p))) + if (!odr_sequence_begin(o, p, sizeof(**p), 0)) return opt && odr_ok(o); return odr_implicit(o, odr_bool, &(*p)->ascending, ODR_CONTEXT, 1, 0) && @@ -154,68 +186,79 @@ int z_Order(ODR o, Z_Order **p, int opt) odr_sequence_end(o); } -int z_Usage(ODR o, Z_Usage **p, int opt) +int z_Usage(ODR o, Z_Usage **p, int opt, const char *name) { - if (!odr_sequence_begin(o, p, sizeof(**p))) + if (!odr_sequence_begin(o, p, sizeof(**p), 0)) return opt && odr_ok(o); return odr_implicit(o, odr_integer, &(*p)->type, ODR_CONTEXT, 1, 0) && odr_implicit(o, z_InternationalString, &(*p)->restriction, ODR_CONTEXT, - 2, 1) && + 2, 1) && odr_sequence_end(o); } -int z_HitVector(ODR o, Z_HitVector **p, int opt) +int z_HitVector(ODR o, Z_HitVector **p, int opt, const char *name) { - if (!odr_sequence_begin(o, p, sizeof(**p))) + if (!odr_sequence_begin(o, p, sizeof(**p), 0)) return opt && odr_ok(o); return - z_Term(o, &(*p)->satisfier, 1) && - odr_implicit(o, z_IntUnit, &(*p)->offsetIntoElement, ODR_CONTEXT, 1, 1) && + z_Term(o, &(*p)->satisfier, 1, 0) && + odr_implicit(o, z_IntUnit, &(*p)->offsetIntoElement, + ODR_CONTEXT, 1, 1) && odr_implicit(o, z_IntUnit, &(*p)->length, ODR_CONTEXT, 2, 1) && odr_implicit(o, odr_integer, &(*p)->hitRank, ODR_CONTEXT, 3, 1) && odr_implicit(o, odr_octetstring, &(*p)->targetToken, ODR_CONTEXT, - 4, 1) && + 4, 1) && odr_sequence_end(o); } -int z_Triple(ODR o, Z_Triple **p, int opt) +int z_Triple(ODR o, Z_Triple **p, int opt, const char *name) { static Odr_arm arm[] = { - {ODR_NONE, -1, -1, Z_Triple_integer, odr_integer}, - {ODR_NONE, -1, -1, Z_Triple_internationalString, z_InternationalString}, + {ODR_NONE, -1, -1, Z_Triple_integer, + (Odr_fun)odr_integer, 0}, + {ODR_NONE, -1, -1, Z_Triple_internationalString, + (Odr_fun)z_InternationalString, 0}, /* The entry below provides some backwards compatibility */ - {ODR_NONE, -1, -1, Z_Triple_internationalString, odr_visiblestring}, - {ODR_NONE, -1, -1, Z_Triple_octetString, odr_octetstring}, - {ODR_NONE, -1, -1, Z_Triple_oid, odr_oid}, - {ODR_NONE, -1, -1, Z_Triple_boolean, odr_bool}, - {ODR_NONE, -1, -1, Z_Triple_null, odr_null}, - {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Triple_unit, z_Unit}, - {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Triple_valueAndUnit, z_IntUnit}, - {-1, -1, -1, -1, 0} + {ODR_NONE, -1, -1, Z_Triple_internationalString, + (Odr_fun)odr_visiblestring, 0}, + {ODR_NONE, -1, -1, Z_Triple_octetString, + (Odr_fun)odr_octetstring, 0}, + {ODR_NONE, -1, -1, Z_Triple_oid, + (Odr_fun)odr_oid, 0}, + {ODR_NONE, -1, -1, Z_Triple_boolean, + (Odr_fun)odr_bool, 0}, + {ODR_NONE, -1, -1, Z_Triple_null, + (Odr_fun)odr_null, 0}, + {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Triple_unit, + (Odr_fun)z_Unit, 0}, + {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Triple_valueAndUnit, + (Odr_fun)z_IntUnit, 0}, + {-1, -1, -1, -1, 0, 0} }; - - if (!odr_sequence_begin(o, p, sizeof(**p))) + + if (!odr_sequence_begin(o, p, sizeof(**p), 0)) return opt && odr_ok(o); return odr_implicit(o, odr_oid, &(*p)->variantSetId, ODR_CONTEXT, 0, 1) && odr_implicit(o, odr_integer, &(*p)->zclass, ODR_CONTEXT, 1, 0) && odr_implicit(o, odr_integer, &(*p)->type, ODR_CONTEXT, 2, 0) && - odr_constructed_begin(o, &(*p)->value, ODR_CONTEXT, 3) && - odr_choice(o, arm, &(*p)->value, &(*p)->which) && + odr_constructed_begin(o, &(*p)->value, ODR_CONTEXT, 3, 0) && + odr_choice(o, arm, &(*p)->value, &(*p)->which, 0) && odr_constructed_end(o) && odr_sequence_end(o); } -int z_Variant(ODR o, Z_Variant **p, int opt) +int z_Variant(ODR o, Z_Variant **p, int opt, const char *name) { - if (!odr_sequence_begin(o, p, sizeof(**p))) + if (!odr_sequence_begin(o, p, sizeof(**p), 0)) return opt && odr_ok(o); return - odr_implicit(o, odr_oid, &(*p)->globalVariantSetId, ODR_CONTEXT, - 1, 1) && + odr_implicit(o, odr_oid, &(*p)->globalVariantSetId, + ODR_CONTEXT, 1, 1) && odr_implicit_settag(o, ODR_CONTEXT, 2) && - odr_sequence_of(o, z_Triple, &(*p)->triples, &(*p)->num_triples) && + odr_sequence_of(o, (Odr_fun)z_Triple, &(*p)->triples, + &(*p)->num_triples, 0) && odr_sequence_end(o); }