X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zutil%2Fprt-ext.c;h=a2a4f91ad5f279995d8dfad37ee8621bdd099a63;hb=c9b1ffcb5d47aa1cd0c0812c55bd1a3301cf834c;hp=14ff4a0db2617234b70f60af8eacf8b097d9be21;hpb=8d08fd5b79e49e14ca014de8e6bed12a2cc0468d;p=yaz-moved-to-github.git diff --git a/zutil/prt-ext.c b/zutil/prt-ext.c index 14ff4a0..a2a4f91 100644 --- a/zutil/prt-ext.c +++ b/zutil/prt-ext.c @@ -3,7 +3,14 @@ * See the file LICENSE for details. * * $Log: prt-ext.c,v $ - * Revision 1.5 2001-03-25 21:55:13 adam + * Revision 1.7 2001-09-24 21:51:56 adam + * New Z39.50 OID utilities: yaz_oidval_to_z3950oid, yaz_str_to_z3950oid + * and yaz_z3950oid_to_str. + * + * Revision 1.6 2001/05/17 14:16:15 adam + * Added EXTERNAL handling for item update0 (1.0). + * + * Revision 1.5 2001/03/25 21:55:13 adam * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate. * * Revision 1.4 2000/03/14 15:22:04 ian @@ -188,8 +195,9 @@ int z_External(ODR o, Z_External **p, int opt, const char *name) #ifdef ASN_COMPILED {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_ESAdmin, (Odr_fun)z_Admin, 0}, -#endif - {-1, -1, -1, -1, 0, 0} + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_update0, + (Odr_fun)z_IU0Update, 0}, +#endif {-1, -1, -1, -1, 0, 0} }; odr_implicit_settag(o, ODR_UNIVERSAL, ODR_EXTERNAL); @@ -224,20 +232,16 @@ int z_External(ODR o, Z_External **p, int opt, const char *name) Z_External *z_ext_record(ODR o, int format, const char *buf, int len) { Z_External *thisext; - oident recform; - int oid[OID_SIZE]; thisext = (Z_External *) odr_malloc(o, sizeof(*thisext)); thisext->descriptor = 0; thisext->indirect_reference = 0; - recform.proto = PROTO_Z3950; - recform.oclass = CLASS_RECSYN; - recform.value = (enum oid_value) format; - if (!oid_ent_to_oid(&recform, oid)) + thisext->direct_reference = + yaz_oidval_to_z3950oid (o, CLASS_RECSYN, format); + if (!thisext->direct_reference) return 0; - thisext->direct_reference = odr_oiddup(o, oid); - + if (len < 0) /* Structured data */ { switch (format)