/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2013 Index Data
* See the file LICENSE for details.
*/
-
/**
* \file prt-ext.c
* \brief Implements handling of various Z39.50 Externals
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <yaz/proto.h>
/*
* 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.
+ * map indirect references when they show up.
*/
static Z_ext_typeent type_table[] =
{
{{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},
{{1, 2, 840, 10003, 8, 1,-1}, Z_External_acfPrompt1, (Odr_fun) z_PromptObject1},
{{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}
};
encoding CHOICE {
single-ASN1-type [0] ABSTRACT_SYNTAX.&Type,
octet-aligned [1] IMPLICIT OCTET STRING,
- arbitrary [2] IMPLICIT BIT STRING
+ arbitrary [2] IMPLICIT BIT STRING
}
}
</pre>
(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,
(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}
};
Odr_oct *oct;
int r;
if (!odr_implicit_tag(o, odr_octetstring, &oct,
- ODR_CONTEXT, 1, 0, "octetaligned"))
+ ODR_CONTEXT, 1, 0, "octetaligned"))
return 0;
/* Save our decoding ODR members */
- o_bp = o->bp;
+ o_bp = o->bp;
o_buf = o->buf;
o_size = o->size;
r = (*type->fun)(o, &voidp, 0, 0);
(*p)->which = type->what;
(*p)->u.single_ASN1_type = (Odr_any*) voidp;
-
+
/* Restore our decoding ODR member */
- o->bp = o_bp;
+ o->bp = o_bp;
o->buf = o_buf;
o->size = o_size;
return r && odr_sequence_end(o);
}
if (zclass == ODR_CONTEXT && tag == 0 && cons == 1)
- {
+ {
/* It's single ASN.1 type, bias the CHOICE. */
odr_choice_bias(o, type->what);
}
odr_sequence_end(o);
}
-Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len)
+Z_External *z_ext_record_oid_nmem(NMEM nmem, 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 = (Z_External *) nmem_malloc(nmem, 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->direct_reference = odr_oiddup_nmem(nmem, oid);
if (len < 0) /* Structured data */
{
return 0;
}
}
- 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));
-
+ else if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs))
+ { /* SUTRS is a single-ASN.1-type */
+ Odr_oct *sutrs = (Odr_oct *)nmem_malloc(nmem, sizeof(*sutrs));
+
thisext->which = Z_External_sutrs;
thisext->u.sutrs = sutrs;
- sutrs->buf = (unsigned char *)odr_malloc(o, len);
+ sutrs->buf = (unsigned char *)nmem_malloc(nmem, len);
sutrs->len = sutrs->size = len;
memcpy(sutrs->buf, buf, len);
}
{
thisext->which = Z_External_octet;
if (!(thisext->u.octet_aligned = (Odr_oct *)
- odr_malloc(o, sizeof(Odr_oct))))
+ nmem_malloc(nmem, sizeof(Odr_oct))))
return 0;
if (!(thisext->u.octet_aligned->buf = (unsigned char *)
- odr_malloc(o, len)))
+ nmem_malloc(nmem, len)))
return 0;
memcpy(thisext->u.octet_aligned->buf, buf, len);
thisext->u.octet_aligned->len = thisext->u.octet_aligned->size = len;
return thisext;
}
+Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid,
+ const char *buf, int len)
+{
+ return z_ext_record_oid_nmem(o->mem, oid, buf, 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];
- 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;
projects / yaz-moved-to-github.git / blobdiff