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

diff --git a/data1/d1_espec.c b/data1/d1_espec.c
index ac43e3f..2762e29 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) 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
@@ -20,6 +17,9 @@ 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>
@@ -29,20 +29,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
@@ -92,7 +87,7 @@ static Z_Occurrences *read_occurrences(char *occ, NMEM nmem,
 {
     Z_Occurrences *op = (Z_Occurrences *)nmem_malloc(nmem, sizeof(*op));
     char *p;
-    
+
     if (!occ)
     {
 	op->which = Z_Occurrences_values;
@@ -114,7 +109,7 @@ static Z_Occurrences *read_occurrences(char *occ, NMEM nmem,
     else
     {
 	Z_OccurValues *ov = (Z_OccurValues *)nmem_malloc(nmem, sizeof(*ov));
-    
+
 	if (!d1_isdigit(*occ))
 	{
 	    yaz_log(YLOG_WARN, "%s:%d: Bad occurrences-spec %s",
@@ -140,7 +135,7 @@ static Z_ETagUnit *read_tagunit(char *buf, NMEM nmem,
     int terms;
     int type;
     char value[512], occ[512];
-    
+
     if (*buf == '*')
     {
 	u->which = Z_ETagUnit_wildPath;
@@ -161,7 +156,7 @@ static Z_ETagUnit *read_tagunit(char *buf, NMEM nmem,
 	Z_SpecificTag *t;
 	char *valp = value;
 	int force_string = 0;
-	
+
 	if (*valp == '\'')
 	{
 	    valp++;
@@ -223,10 +218,10 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
     int argc, size_esn = 0;
     char *argv[50], line[512];
     Z_Espec1 *res = (Z_Espec1 *)nmem_malloc(nmem, sizeof(*res));
-    
+
     if (!(f = data1_path_fopen(dh, file, "r")))
 	return 0;
-    
+
     res->num_elementSetNames = 0;
     res->elementSetNames = 0;
     res->defaultVariantSetId = 0;
@@ -234,19 +229,19 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
     res->defaultTagType = 0;
     res->num_elements = 0;
     res->elements = 0;
-    
+
     while ((argc = readconf_line(f, &lineno, line, 512, argv, 50)))
 	if (!strcmp(argv[0], "elementsetnames"))
 	{
 	    int nnames = argc-1, i;
-	    
+
 	    if (!nnames)
 	    {
 		yaz_log(YLOG_WARN, "%s:%d: Empty elementsetnames directive",
 			file, lineno);
 		continue;
 	    }
-	    
+
 	    res->elementSetNames =
 		(char **)nmem_malloc(nmem, sizeof(char**)*nnames);
 	    for (i = 0; i < nnames; i++)
@@ -299,7 +294,7 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
 	    char *path = argv[1];
 	    char *ep;
 	    int num, i = 0;
-	    
+
 	    if (!res->elements)
 		res->elements = (Z_ElementRequest **)
 		    nmem_malloc(nmem, size_esn = 24*sizeof(er));
@@ -317,7 +312,7 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
 			file, lineno, argv[0]);
 		continue;
 	    }
-	    
+
 	    res->elements[res->num_elements++] = er =
 		(Z_ElementRequest *)nmem_malloc(nmem, sizeof(*er));
 	    er->which = Z_ERequest_simpleElement;
@@ -333,14 +328,14 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
 		;
 	    tp->tags = (Z_ETagUnit **)
 		nmem_malloc(nmem, sizeof(Z_ETagUnit*)*num);
-	    
+
 	    for ((ep = strchr(path, '/')) ; path ;
 		 (void)((path = ep) && (ep = strchr(path, '/'))))
 	    {
 		Z_ETagUnit *tagunit;
 		if (ep)
 		    ep++;
-		
+
 		assert(i<num);
 		tagunit = read_tagunit(path, nmem, file, lineno);
 		if (!tagunit)
@@ -351,7 +346,7 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
 		}
 		tp->tags[tp->num_tags++] = tagunit;
 	    }
-	    
+
 	    if (argc > 2 && !strcmp(argv[2], "variant"))
 		se->variantRequest=
 		    read_variant(argc-3, argv+3, nmem, file, lineno);
@@ -365,6 +360,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