X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_espec.c;h=ea73ee4495366a5cd33eead30b05cd2bef8971ab;hb=2bd4d9a189d39c773579a25b93e97cee0602a0a4;hp=3f24b48a94ee71d89a8dca49a569115768b333d3;hpb=96f2ba71b5c9042a90ca94ea84a79cd89a2957d5;p=idzebra-moved-to-github.git

diff --git a/data1/d1_espec.c b/data1/d1_espec.c
index 3f24b48..ea73ee4 100644
--- a/data1/d1_espec.c
+++ b/data1/d1_espec.c
@@ -1,8 +1,5 @@
-/* $Id: d1_espec.c,v 1.8 2005-02-08 00:36:08 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 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
@@ -15,33 +12,32 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
+#include <ctype.h>
 
 #include <yaz/log.h>
 #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
@@ -191,7 +187,6 @@ static Z_ETagUnit *read_tagunit(char *buf, NMEM nmem,
     }
     else if ((terms = sscanf(buf, "%511[^)]", value)) >= 1)
     {
-	int numval;
 	Z_SpecificTag *t;
 	char *valp = value;
 
@@ -225,10 +220,7 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
     Z_Espec1 *res = (Z_Espec1 *)nmem_malloc(nmem, sizeof(*res));
     
     if (!(f = data1_path_fopen(dh, file, "r")))
-    {
-	yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", file);
 	return 0;
-    }
     
     res->num_elementSetNames = 0;
     res->elementSetNames = 0;
@@ -365,3 +357,12 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
     fclose (f);
     return res;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+