X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_espec.c;h=4c648403853f38aea9ef44695a6af15634469027;hp=ac43e3f9fe7a92b4bd6d0301f2af7d2102351bb9;hb=1872e3fc60b482771bbd1cb4b0290b8d6a9ef5d0;hpb=4e67b823f05b521f193af096a40c0f64758c5fc1 diff --git a/data1/d1_espec.c b/data1/d1_espec.c index ac43e3f..4c64840 100644 --- a/data1/d1_espec.c +++ b/data1/d1_espec.c @@ -1,4 +1,4 @@ -/* $Id: d1_espec.c,v 1.13 2007-01-15 15:10:14 adam Exp $ +/* $Id: d1_espec.c,v 1.14 2007-04-16 08:44:31 adam Exp $ Copyright (C) 1995-2007 Index Data ApS @@ -29,20 +29,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include static Z_Variant *read_variant(int argc, char **argv, NMEM nmem, const char *file, int lineno) { Z_Variant *r = (Z_Variant *)nmem_malloc(nmem, sizeof(*r)); - oident var1; int i; - int oid[OID_SIZE]; - - var1.proto = PROTO_Z3950; - var1.oclass = CLASS_VARSET; - var1.value = VAL_VAR1; - r->globalVariantSetId = odr_oiddup_nmem(nmem, oid_ent_to_oid(&var1, oid)); + r->globalVariantSetId = odr_oiddup_nmem(nmem, yaz_oid_variant1()); if (argc) r->triples = (Z_Triple **)nmem_malloc(nmem, sizeof(Z_Triple*) * argc); else