X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_espec.c;h=9e6aa0e55c37e2bd409bb0e66278021924498e9d;hb=1895d4f884802edff2e8b594297bffb0ef80b8bd;hp=ac43e3f9fe7a92b4bd6d0301f2af7d2102351bb9;hpb=89d3a004b7c651fd5673abfc192e1472dc4d4197;p=idzebra-moved-to-github.git

diff --git a/data1/d1_espec.c b/data1/d1_espec.c
index ac43e3f..9e6aa0e 100644
--- a/data1/d1_espec.c
+++ b/data1/d1_espec.c
@@ -1,8 +1,5 @@
-/* $Id: d1_espec.c,v 1.13 2007-01-15 15:10:14 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2010 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -29,20 +26,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/odr.h>
 #include <yaz/proto.h>
 #include <idzebra/data1.h>
+#include <yaz/oid_db.h>
 
 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_varset_variant_1);
     if (argc)
 	r->triples = (Z_Triple **)nmem_malloc(nmem, sizeof(Z_Triple*) * argc);
     else
@@ -365,6 +357,7 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab