X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fprt-ext.c;h=670021bc9b3e1e7952ff29fa7712d99821b9faa9;hp=42b15802fcc00503273ef024cc0f430d7ce96f78;hb=8de81d57ebf189d37a160fe66df667b50ba7cb86;hpb=1318fabb307dce513479df1890cac2f20cddda45 diff --git a/asn/prt-ext.c b/asn/prt-ext.c index 42b1580..670021b 100644 --- a/asn/prt-ext.c +++ b/asn/prt-ext.c @@ -1,10 +1,39 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-1998, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: prt-ext.c,v $ - * Revision 1.10 1996-10-09 15:54:55 quinn + * Revision 1.19 1998-03-31 15:13:19 adam + * Development towards compiled ASN.1. + * + * Revision 1.18 1998/03/31 11:07:44 adam + * Furhter work on UNIverse resource report. + * Added Extended Services handling in frontend server. + * + * Revision 1.17 1998/03/20 14:46:06 adam + * Added UNIverse Resource Reports. + * + * Revision 1.16 1998/02/11 11:53:32 adam + * Changed code so that it compiles as C++. + * + * Revision 1.15 1998/02/10 15:31:46 adam + * Implemented date and time structure. Changed the Update Extended + * Service. + * + * Revision 1.14 1998/01/05 09:04:57 adam + * Fixed bugs in encoders/decoders - Not operator (!) missing. + * + * Revision 1.13 1997/05/14 06:53:22 adam + * C++ support. + * + * Revision 1.12 1997/04/30 08:52:02 quinn + * Null + * + * Revision 1.11 1996/10/10 12:35:13 quinn + * Added Update extended service. + * + * Revision 1.10 1996/10/09 15:54:55 quinn * Added SearchInfoReport * * Revision 1.9 1996/06/10 08:53:36 quinn @@ -46,19 +75,26 @@ */ static Z_ext_typeent type_table[] = { - {VAL_SUTRS, Z_External_sutrs, z_SUTRS}, - {VAL_EXPLAIN, Z_External_explainRecord, z_ExplainRecord}, - {VAL_RESOURCE1, Z_External_resourceReport1, z_ResourceReport1}, - {VAL_RESOURCE2, Z_External_resourceReport2, z_ResourceReport2}, - {VAL_PROMPT1, Z_External_promptObject1, z_PromptObject1 }, - {VAL_GRS1, Z_External_grs1, z_GenericRecord}, - {VAL_EXTENDED, Z_External_extendedService, z_TaskPackage}, - {VAL_ITEMORDER, Z_External_itemOrder, z_ItemOrder}, - {VAL_DIAG1, Z_External_diag1, z_DiagnosticFormat}, - {VAL_ESPEC1, Z_External_espec1, z_Espec1}, - {VAL_SUMMARY, Z_External_summary, z_BriefBib}, - {VAL_OPAC, Z_External_OPAC, z_OPACRecord}, - {VAL_SEARCHRES1, Z_External_searchResult1, z_SearchInfoReport}, + {VAL_SUTRS, Z_External_sutrs, (Odr_fun) z_SUTRS}, + {VAL_EXPLAIN, Z_External_explainRecord, (Odr_fun)z_ExplainRecord}, + {VAL_RESOURCE1, Z_External_resourceReport1, (Odr_fun)z_ResourceReport1}, + {VAL_RESOURCE2, Z_External_resourceReport2, (Odr_fun)z_ResourceReport2}, + {VAL_PROMPT1, Z_External_promptObject1, (Odr_fun)z_PromptObject1 }, + {VAL_GRS1, Z_External_grs1, (Odr_fun)z_GenericRecord}, + {VAL_EXTENDED, Z_External_extendedService, (Odr_fun)z_TaskPackage}, +#ifdef ASN_COMPILED + {VAL_ITEMORDER, Z_External_itemOrder, (Odr_fun)z_IOItemOrder}, +#else + {VAL_ITEMORDER, Z_External_itemOrder, (Odr_fun)z_ItemOrder}, +#endif + {VAL_DIAG1, Z_External_diag1, (Odr_fun)z_DiagnosticFormat}, + {VAL_ESPEC1, Z_External_espec1, (Odr_fun)z_Espec1}, + {VAL_SUMMARY, Z_External_summary, (Odr_fun)z_BriefBib}, + {VAL_OPAC, Z_External_OPAC, (Odr_fun)z_OPACRecord}, + {VAL_SEARCHRES1, Z_External_searchResult1, (Odr_fun)z_SearchInfoReport}, + {VAL_DBUPDATE, Z_External_update, (Odr_fun)z_IUUpdate}, + {VAL_DATETIME, Z_External_dateTime, (Odr_fun)z_DateTime}, + {VAL_UNIVERSE_REPORT, Z_External_universeReport, (Odr_fun)z_UniverseReport}, {VAL_NONE, 0, 0} }; @@ -79,29 +115,37 @@ int z_External(ODR o, Z_External **p, int opt) static Odr_arm arm[] = { - {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_single, odr_any}, - {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_External_octet, odr_octetstring}, - {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_External_arbitrary, odr_bitstring}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_single, (Odr_fun)odr_any}, + {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_External_octet, (Odr_fun)odr_octetstring}, + {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_External_arbitrary, (Odr_fun)odr_bitstring}, - {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_sutrs, z_SUTRS}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_sutrs, (Odr_fun)z_SUTRS}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_explainRecord, - z_ExplainRecord}, + (Odr_fun)z_ExplainRecord}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_resourceReport1, - z_ResourceReport1}, + (Odr_fun)z_ResourceReport1}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_resourceReport2, - z_ResourceReport2}, + (Odr_fun)z_ResourceReport2}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_promptObject1, - z_PromptObject1}, - {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_grs1, z_GenericRecord}, + (Odr_fun)z_PromptObject1}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_grs1, (Odr_fun)z_GenericRecord}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_extendedService, - z_TaskPackage}, - {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_itemOrder, z_ItemOrder}, - {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_diag1, z_DiagnosticFormat}, - {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_espec1, z_Espec1}, - {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_summary, z_BriefBib}, - {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_OPAC, z_OPACRecord}, + (Odr_fun)z_TaskPackage}, +#ifdef ASN_COMPILED + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_itemOrder, (Odr_fun)z_IOItemOrder}, +#else + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_itemOrder, (Odr_fun)z_ItemOrder}, +#endif + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_diag1, (Odr_fun)z_DiagnosticFormat}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_espec1, (Odr_fun)z_Espec1}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_summary, (Odr_fun)z_BriefBib}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_OPAC, (Odr_fun)z_OPACRecord}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_searchResult1, - z_SearchInfoReport}, + (Odr_fun)z_SearchInfoReport}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_update, (Odr_fun)z_IUUpdate}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_dateTime, (Odr_fun)z_DateTime}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_universeReport, + (Odr_fun)z_UniverseReport}, {-1, -1, -1, -1, 0} }; @@ -119,14 +163,14 @@ int z_External(ODR o, Z_External **p, int opt) (oid = oid_getentbyoid((*p)->direct_reference)) && (type = z_ext_getentbyref(oid->value))) { - int class, tag, cons; + int zclass, tag, cons; /* * We know it. If it's represented as an ASN.1 type, bias the CHOICE. */ - if (!odr_peektag(o, &class, &tag, &cons)) + if (!odr_peektag(o, &zclass, &tag, &cons)) return opt && odr_ok(o); - if (class == ODR_CONTEXT && tag == 0 && cons == 1) + if (zclass == ODR_CONTEXT && tag == 0 && cons == 1) odr_choice_bias(o, type->what); } return