From a07a5e7fcd5417f81b546be932619b90e05ba72c Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 10 Jul 2008 10:46:49 +0200 Subject: [PATCH] Added z_ext_record_oid_any() function. This is a simplified version of z_ext_record_oid(). It does the same oid lookups, but adds the record as an Odr_any. --- include/yaz/prt-ext.h | 3 +++ src/prt-ext.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/include/yaz/prt-ext.h b/include/yaz/prt-ext.h index 74f88e5..b59e358 100644 --- a/include/yaz/prt-ext.h +++ b/include/yaz/prt-ext.h @@ -142,6 +142,9 @@ YAZ_EXPORT Z_ext_typeent *z_ext_getentbyref(const Odr_oid *oid); /** \brief encodes EXTERNAL record based on OID (NULL if not known) */ YAZ_EXPORT Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len); +/** \brief encodes EXTERNAL record as ANY */ +YAZ_EXPORT Z_External *z_ext_record_oid_any(ODR o, const Odr_oid *oid, + const char *buf, int len); /** \brief encodes EXTERNAL XML record */ YAZ_EXPORT Z_External *z_ext_record_xml(ODR o, const char *buf, int len); diff --git a/src/prt-ext.c b/src/prt-ext.c index 84234ed..c807348 100644 --- a/src/prt-ext.c +++ b/src/prt-ext.c @@ -318,6 +318,37 @@ Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len return thisext; } +Z_External *z_ext_record_oid_any(ODR o, const Odr_oid *oid, const char *buf, int len) +{ + Z_External *thisext; + char oid_str_buf[OID_STR_MAX]; + const char *oid_str; + oid_class oclass; + + if (!oid) + return 0; + thisext = (Z_External *) odr_malloc(o, sizeof(*thisext)); + thisext->descriptor = 0; + thisext->indirect_reference = 0; + + oid_str = yaz_oid_to_string_buf(oid, &oclass, oid_str_buf); + + thisext->direct_reference = odr_oiddup(o, oid); + + { + thisext->which = Z_External_single; + thisext->u.single_ASN1_type = (Odr_any *)odr_malloc(o, sizeof(Odr_any)); + if ( ! thisext->u.single_ASN1_type ) + return 0; + thisext->u.single_ASN1_type->buf = (unsigned char *)odr_malloc(o, len); + if ( ! thisext->u.single_ASN1_type->buf ) + return 0; + memcpy(thisext->u.single_ASN1_type->buf, buf, len); + thisext->u.single_ASN1_type->len = thisext->u.single_ASN1_type->size = len; + } + return thisext; +} + Z_External *z_ext_record_xml(ODR o, const char *buf, int len) { return z_ext_record_oid(o, yaz_oid_recsyn_xml, buf, len); -- 1.7.10.4