-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
- *
- * $Id: zget.c,v 1.13 2007-04-12 13:52:57 adam Exp $
*/
/**
* \file zget.c
Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)
odr_malloc (o, sizeof(*dr));
- dr->diagnosticSetId = yaz_string_to_oid_odr(
- yaz_oid_std(), CLASS_DIAGSET, OID_STR_BIB1, o);
+ dr->diagnosticSetId = odr_oiddup(o, yaz_oid_diagset_bib_1);
dr->condition = odr_intdup(o, error);
dr->which = Z_DefaultDiagFormat_v2Addinfo;
dr->u.v2Addinfo = odr_strdup (o, addinfo ? addinfo : "");
x = (Z_External*) odr_malloc(odr, sizeof *x);
x->descriptor = 0;
x->indirect_reference = 0;
- x->direct_reference = yaz_string_to_oid_odr(yaz_oid_std(),
- CLASS_USERINFO,
- OID_STR_USERINFO_1,
- odr);
+ x->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_userinfo_1);
x->which = Z_External_userInfo1;
- u = odr_malloc(odr, sizeof *u);
+ u = (Z_OtherInformation *) odr_malloc(odr, sizeof *u);
x->u.userInfo1 = u;
u->num_elements = 1;
u->list = (Z_OtherInformationUnit**) odr_malloc(odr, sizeof *u->list);
l->information.externallyDefinedInfo = x2;
x2->descriptor = 0;
x2->indirect_reference = 0;
- x2->direct_reference = yaz_string_to_oid_odr(yaz_oid_std(),
- CLASS_DIAGSET,
- OID_STR_DIAG1,
- odr);
+ x2->direct_reference = odr_oiddup(odr, yaz_oid_diagset_diag_1);
x2->which = Z_External_diag1;
d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d);
int octet_len;
ODR encode;
- u = odr_malloc(odr, sizeof *u);
+ u = (Z_OtherInformation *) odr_malloc(odr, sizeof *u);
u->num_elements = 1;
u->list = (Z_OtherInformationUnit**) odr_malloc(odr, sizeof *u->list);
u->list[0] = (Z_OtherInformationUnit*) odr_malloc(odr, sizeof *u->list[0]);
x2->descriptor = 0;
x2->indirect_reference = 0;
- x2->direct_reference = yaz_string_to_oid_odr(yaz_oid_std(),
- CLASS_DIAGSET,
- OID_STR_DIAG1,
- odr);
+ x2->direct_reference = odr_oiddup(odr, yaz_oid_diagset_diag_1);
x2->which = Z_External_diag1;
d = (Z_DiagnosticFormat*) odr_malloc(odr, sizeof *d);
x = (Z_External*) odr_malloc(odr, sizeof *x);
x->descriptor = 0;
x->indirect_reference = 0;
- x->direct_reference = yaz_string_to_oid_odr(yaz_oid_std(),
- CLASS_USERINFO,
- OID_STR_USERINFO_1,
- odr);
-
+ x->direct_reference = odr_oiddup(odr, yaz_oid_userinfo_userinfo_1);
x->which = Z_External_octet;
x->u.octet_aligned = (Odr_oct *) odr_malloc(odr, sizeof(Odr_oct));
- x->u.octet_aligned->buf = odr_malloc(odr, octet_len);
+ x->u.octet_aligned->buf = (unsigned char *) odr_malloc(odr, octet_len);
memcpy(x->u.octet_aligned->buf, octet_buf, octet_len);
x->u.octet_aligned->len = octet_len;