X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fprt-ext.c;h=f17099482cfb6a65a3930511c1b5bcb868057e31;hp=d784b83a3f4eddd2e819edfe5db8c64c1ecb702d;hb=896b145fa7a02199bfc3e8aa824c018b9d7cbf98;hpb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505 diff --git a/src/prt-ext.c b/src/prt-ext.c index d784b83..f170994 100644 --- a/src/prt-ext.c +++ b/src/prt-ext.c @@ -1,17 +1,18 @@ -/* - * Copyright (C) 1995-2005, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. - * - * $Id: prt-ext.c,v 1.6 2005-06-25 15:46:04 adam Exp $ */ - /** * \file prt-ext.c * \brief Implements handling of various Z39.50 Externals */ +#if HAVE_CONFIG_H +#include +#endif #include +#include #define PRT_EXT_DEBUG 0 #if PRT_EXT_DEBUG @@ -25,43 +26,49 @@ */ 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}, - {VAL_ITEMORDER, Z_External_itemOrder, (Odr_fun)z_IOItemOrder}, - {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_DBUPDATE0, Z_External_update0, (Odr_fun)z_IU0Update}, - {VAL_DBUPDATE1, Z_External_update0, (Odr_fun)z_IU0Update}, - {VAL_DATETIME, Z_External_dateTime, (Odr_fun)z_DateTime}, - {VAL_UNIVERSE_REPORT, Z_External_universeReport,(Odr_fun)z_UniverseReport}, - {VAL_ADMINSERVICE, Z_External_ESAdmin, (Odr_fun)z_Admin}, - {VAL_USERINFO1, Z_External_userInfo1, (Odr_fun) z_OtherInformation}, - {VAL_CHARNEG3, Z_External_charSetandLanguageNegotiation, (Odr_fun) + {{1, 2, 840, 10003, 5, 101,-1}, Z_External_sutrs, (Odr_fun) z_SUTRS}, + {{1, 2, 840, 10003, 5, 100,-1}, Z_External_explainRecord, (Odr_fun)z_ExplainRecord}, + {{1, 2, 840, 10003, 7, 1,-1}, Z_External_resourceReport1, (Odr_fun)z_ResourceReport1}, + {{1, 2, 840, 10003, 7, 2,-1}, Z_External_resourceReport2, (Odr_fun)z_ResourceReport2}, + {{1, 2, 840, 10003, 8, 1,-1}, Z_External_promptObject1, (Odr_fun)z_PromptObject1 }, + {{1, 2, 840, 10003, 5, 105,-1}, Z_External_grs1, (Odr_fun)z_GenericRecord}, + {{1, 2, 840, 10003, 5, 106,-1}, Z_External_extendedService, (Odr_fun)z_TaskPackage}, + {{1, 2, 840, 10003, 9, 4,-1}, Z_External_itemOrder, (Odr_fun)z_IOItemOrder}, + {{1, 2, 840, 10003, 4, 2,-1}, Z_External_diag1, (Odr_fun)z_DiagnosticFormat}, + {{1, 2, 840, 10003, 11, 1,-1}, Z_External_espec1, (Odr_fun)z_Espec1}, + {{1, 2, 840, 10003, 5, 103,-1}, Z_External_summary, (Odr_fun)z_BriefBib}, + {{1, 2, 840, 10003, 5, 102,-1}, Z_External_OPAC, (Odr_fun)z_OPACRecord}, + {{1, 2, 840, 10003, 10, 1,-1}, Z_External_searchResult1, (Odr_fun)z_SearchInfoReport}, + {{1, 2, 840, 10003, 9, 5,-1}, Z_External_update0, (Odr_fun)z_IU0Update}, + {{1, 2, 840, 10003, 9, 5, 1,-1}, Z_External_update0, (Odr_fun)z_IU0Update}, + {{1, 2, 840, 10003, 9, 5, 1, 1,-1}, Z_External_update, (Odr_fun)z_IUUpdate}, + {{1, 2, 840, 10003, 10, 6,-1}, Z_External_dateTime, (Odr_fun)z_DateTime}, + {{1, 2, 840, 10003, 7, 1000, 81, 1,-1}, Z_External_universeReport,(Odr_fun)z_UniverseReport}, + {{1, 2, 840, 10003, 9, 1000, 81, 1,-1}, Z_External_ESAdmin, (Odr_fun)z_Admin}, + {{1, 2, 840, 10003, 10, 3,-1}, Z_External_userInfo1, (Odr_fun) z_OtherInformation}, + {{1, 2, 840, 10003, 10, 1000, 81, 5,-1}, Z_External_userFacets, (Odr_fun) z_FacetList}, + {{1, 2, 840, 10003, 15, 3,-1}, Z_External_charSetandLanguageNegotiation, (Odr_fun) z_CharSetandLanguageNegotiation}, - {VAL_PROMPT1, Z_External_acfPrompt1, (Odr_fun) z_PromptObject1}, - {VAL_DES1, Z_External_acfDes1, (Odr_fun) z_DES_RN_Object}, - {VAL_KRB1, Z_External_acfKrb1, (Odr_fun) z_KRBObject}, - {VAL_MULTISRCH2, Z_External_multisrch2, (Odr_fun) z_MultipleSearchTerms_2}, - {VAL_CQL, Z_External_CQL, (Odr_fun) z_InternationalString}, - {VAL_NONE, 0, 0} + {{1, 2, 840, 10003, 8, 1,-1}, Z_External_acfPrompt1, (Odr_fun) z_PromptObject1}, + {{1, 2, 840, 10003, 8, 2,-1}, Z_External_acfDes1, (Odr_fun) z_DES_RN_Object}, + {{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} }; -Z_ext_typeent *z_ext_getentbyref(oid_value val) +Z_ext_typeent *z_ext_getentbyref(const Odr_oid *oid) { - Z_ext_typeent *i; + Z_ext_typeent *p; - for (i = type_table; i->dref != VAL_NONE; i++) - if (i->dref == val) - return i; + for (p = type_table; p->oid[0] != -1; p++) + if (!oid_oidcmp(oid, p->oid)) + return p; return 0; } @@ -86,7 +93,6 @@ Z_ext_typeent *z_ext_getentbyref(oid_value val) */ int z_External(ODR o, Z_External **p, int opt, const char *name) { - oident *oid; Z_ext_typeent *type; static Odr_arm arm[] = @@ -139,6 +145,8 @@ int z_External(ODR o, Z_External **p, int opt, const char *name) (Odr_fun)z_IU0Update, 0}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_userInfo1, (Odr_fun)z_OtherInformation, 0}, + {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_userFacets, + (Odr_fun)z_FacetList, "FacetList" }, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_charSetandLanguageNegotiation, (Odr_fun)z_CharSetandLanguageNegotiation, 0}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_External_acfPrompt1, @@ -154,6 +162,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} }; @@ -183,8 +202,7 @@ int z_External(ODR o, Z_External **p, int opt, const char *name) #endif /* Do we know this beast? */ if (o->direction == ODR_DECODE && (*p)->direct_reference && - (oid = oid_getentbyoid((*p)->direct_reference)) && - (type = z_ext_getentbyref(oid->value))) + (type = z_ext_getentbyref((*p)->direct_reference))) { int zclass, tag, cons; /* OID is present and we know it */ @@ -240,18 +258,16 @@ int z_External(ODR o, Z_External **p, int opt, const char *name) odr_sequence_end(o); } -Z_External *z_ext_record(ODR o, int format, const char *buf, int len) +Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len) { Z_External *thisext; + if (!oid) + return 0; thisext = (Z_External *) odr_malloc(o, sizeof(*thisext)); thisext->descriptor = 0; thisext->indirect_reference = 0; - - 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 */ { @@ -263,31 +279,36 @@ Z_External *z_ext_record(ODR o, int format, const char *buf, int len) */ thisext->u.grs1 = (Z_GenericRecord*) buf; - switch (format) + if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs)) { - case VAL_SUTRS: thisext->which = Z_External_sutrs; - break; - case VAL_GRS1: + } + else if (!oid_oidcmp(oid, yaz_oid_recsyn_grs_1)) + { thisext->which = Z_External_grs1; - break; - case VAL_EXPLAIN: + } + else if (!oid_oidcmp(oid, yaz_oid_recsyn_explain)) + { thisext->which = Z_External_explainRecord; - break; - case VAL_SUMMARY: + } + else if (!oid_oidcmp(oid, yaz_oid_recsyn_summary)) + { thisext->which = Z_External_summary; - break; - case VAL_OPAC: + } + else if (!oid_oidcmp(oid, yaz_oid_recsyn_opac)) + { thisext->which = Z_External_OPAC; - break; - case VAL_EXTENDED: + } + else if (!oid_oidcmp(oid, yaz_oid_recsyn_extended)) + { thisext->which = Z_External_extendedService; - break; - default: + } + else + { return 0; } } - else if (format == VAL_SUTRS) /* SUTRS is a single-ASN.1-type */ + else if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs)) /* SUTRS is a single-ASN.1-type */ { Odr_oct *sutrs = (Odr_oct *)odr_malloc(o, sizeof(*sutrs)); @@ -312,9 +333,50 @@ Z_External *z_ext_record(ODR o, int format, 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; + + if (!oid) + return 0; + thisext = (Z_External *) odr_malloc(o, sizeof(*thisext)); + thisext->descriptor = 0; + thisext->indirect_reference = 0; + 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); +} + +Z_External *z_ext_record_sutrs(ODR o, const char *buf, int len) +{ + return z_ext_record_oid(o, yaz_oid_recsyn_sutrs, buf, len); +} + +Z_External *z_ext_record_usmarc(ODR o, const char *buf, int len) +{ + return z_ext_record_oid(o, yaz_oid_recsyn_usmarc, buf, len); +} + /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab