X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fprt-ext.c;h=4549c0f9bbaeff46e34d6d6750c8520e1d2fc0db;hp=c8073482b633ab7c4fa1748bf4f0c4f78bdf93d1;hb=88d3bedf772316f87e1996f655ccf8d1e2589755;hpb=a07a5e7fcd5417f81b546be932619b90e05ba72c diff --git a/src/prt-ext.c b/src/prt-ext.c index c807348..4549c0f 100644 --- a/src/prt-ext.c +++ b/src/prt-ext.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2008 Index Data + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ @@ -51,6 +51,11 @@ static Z_ext_typeent type_table[] = {{1, 2, 840, 10003, 8, 3,-1}, Z_External_acfKrb1, (Odr_fun) z_KRBObject}, {{1, 2, 840, 10003, 10, 5,-1}, Z_External_multisrch2, (Odr_fun) z_MultipleSearchTerms_2}, {{1, 2, 840, 10003, 16, 2, -1}, Z_External_CQL, (Odr_fun) z_InternationalString}, + {{1, 2, 840, 10003, 9, 1,-1}, Z_External_persistentResultSet, (Odr_fun)z_PRPersistentResultSet}, + {{1, 2, 840, 10003, 9, 2,-1}, Z_External_persistentQuery, (Odr_fun)z_PQueryPersistentQuery}, + {{1, 2, 840, 10003, 9, 3,-1}, Z_External_periodicQuerySchedule, (Odr_fun)z_PQSPeriodicQuerySchedule}, + {{1, 2, 840, 10003, 9, 6,-1}, Z_External_exportSpecification, (Odr_fun)z_ESExportSpecification}, + {{1, 2, 840, 10003, 9, 7,-1}, Z_External_exportInvocation, (Odr_fun)z_EIExportInvocation}, {{-1}, 0, 0} }; @@ -152,6 +157,17 @@ int z_External(ODR o, Z_External **p, int opt, const char *name) (Odr_fun)z_InternationalString, 0}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_OCLCUserInfo, (Odr_fun)z_OCLC_UserInformation, 0}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_persistentResultSet, + (Odr_fun)z_PRPersistentResultSet, 0}, + + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_persistentQuery, + (Odr_fun)z_PQueryPersistentQuery, 0}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_periodicQuerySchedule, + (Odr_fun)z_PQSPeriodicQuerySchedule, 0}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_exportSpecification, + (Odr_fun)z_ESExportSpecification, 0}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_exportInvocation, + (Odr_fun)z_EIExportInvocation, 0}, {-1, -1, -1, -1, 0, 0} }; @@ -318,7 +334,8 @@ 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 *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]; @@ -335,17 +352,16 @@ Z_External *z_ext_record_oid_any(ODR o, const Odr_oid *oid, const char *buf, int 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; - } + 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; } @@ -367,6 +383,7 @@ Z_External *z_ext_record_usmarc(ODR o, const char *buf, int len) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab