X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fprt-ext.c;h=670021bc9b3e1e7952ff29fa7712d99821b9faa9;hp=688ef28f3c6ebc91729ded63a669690f2bfcec7c;hb=8de81d57ebf189d37a160fe66df667b50ba7cb86;hpb=63cafe41a93427118959a74201b3e331169a71d9 diff --git a/asn/prt-ext.c b/asn/prt-ext.c index 688ef28..670021b 100644 --- a/asn/prt-ext.c +++ b/asn/prt-ext.c @@ -1,10 +1,51 @@ /* - * 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.6 1995-09-29 17:11: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 + * Added Summary,OPAC,ResourceReport + * + * Revision 1.8 1996/02/20 12:51:44 quinn + * Completed SCAN. Fixed problems with EXTERNAL. + * + * Revision 1.7 1995/10/12 10:34:38 quinn + * Added Espec-1. + * + * Revision 1.6 1995/09/29 17:11:55 quinn * Smallish * * Revision 1.5 1995/09/27 15:02:42 quinn @@ -27,54 +68,86 @@ #include +/* + * The table below should be moved to the ODR structure itself and + * be an image of the association context: To help + * map indirect references when they show up. + */ +static Z_ext_typeent type_table[] = +{ + {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} +}; + +Z_ext_typeent *z_ext_getentbyref(oid_value val) +{ + Z_ext_typeent *i; + + for (i = type_table; i->dref != VAL_NONE; i++) + if (i->dref == val) + return i; + return 0; +} + int z_External(ODR o, Z_External **p, int opt) { - oident *oid; + oident *oid; + Z_ext_typeent *type; 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_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, + (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} }; - /* - * The table below should be moved to the ODR structure itself and - * be an image of the association context: To help - * map indirect references when they show up. - */ - static struct - { - oid_value dref; - int what; /* discriminator value for the external CHOICE */ - } tab[] = - { - {VAL_SUTRS, Z_External_sutrs}, - {VAL_EXPLAIN, Z_External_explainRecord}, - {VAL_RESOURCE1, Z_External_resourceReport1}, - {VAL_RESOURCE2, Z_External_resourceReport2}, - {VAL_PROMPT1, Z_External_promptObject1}, - {VAL_GRS1, Z_External_grs1}, - {VAL_EXTENDED, Z_External_extendedService}, - {VAL_ITEMORDER, Z_External_itemOrder}, - {VAL_DIAG1, Z_External_diag1}, - {VAL_NONE, 0} - }; odr_implicit_settag(o, ODR_UNIVERSAL, ODR_EXTERNAL); if (!odr_sequence_begin(o, p, sizeof(**p))) @@ -87,16 +160,18 @@ int z_External(ODR o, Z_External **p, int opt) * Do we know this beast? */ if (o->direction == ODR_DECODE && (*p)->direct_reference && - (oid = oid_getentbyoid((*p)->direct_reference))) + (oid = oid_getentbyoid((*p)->direct_reference)) && + (type = z_ext_getentbyref(oid->value))) { - int i; + int zclass, tag, cons; - for (i = 0; tab[i].dref != VAL_NONE; i++) - if (oid->value == tab[i].dref) - { - odr_choice_bias(o, tab[i].what); - break; - } + /* + * We know it. If it's represented as an ASN.1 type, bias the CHOICE. + */ + if (!odr_peektag(o, &zclass, &tag, &cons)) + return opt && odr_ok(o); + if (zclass == ODR_CONTEXT && tag == 0 && cons == 1) + odr_choice_bias(o, type->what); } return odr_choice(o, arm, &(*p)->u, &(*p)->which) &&