X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_espec.c;h=8a1b6e070932950f8d3b1e6bdde77c56ddf0ee29;hb=20b140c237f2b6f049ab5fc828c617f0f6eee6c0;hp=9e6f3b60ed2b2052beaf1183870b88ead4dac94e;hpb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;p=idzebra-moved-to-github.git

diff --git a/data1/d1_espec.c b/data1/d1_espec.c
index 9e6f3b6..8a1b6e0 100644
--- a/data1/d1_espec.c
+++ b/data1/d1_espec.c
@@ -1,4 +1,4 @@
-/* $Id: d1_espec.c,v 1.7 2005-01-15 19:38:18 adam Exp $
+/* $Id: d1_espec.c,v 1.9 2005-03-05 11:35:18 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -23,6 +23,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
+#include <ctype.h>
 
 #include <yaz/log.h>
 #include <yaz/odr.h>
@@ -61,10 +62,8 @@ static Z_Variant *read_variant(int argc, char **argv, NMEM nmem,
 	}
 	t = r->triples[i] = (Z_Triple *)nmem_malloc(nmem, sizeof(Z_Triple));
 	t->variantSetId = 0;
-	t->zclass = (int *)nmem_malloc(nmem, sizeof(int));
-	*t->zclass = zclass;
-	t->type = (int *)nmem_malloc(nmem, sizeof(int));
-	*t->type = type;
+	t->zclass = nmem_intdup(nmem, zclass);
+	t->type = nmem_intdup(nmem, type);
 	/*
 	 * This is wrong.. we gotta look up the correct type for the
 	 * variant, I guess... damn this stuff.
@@ -77,16 +76,12 @@ static Z_Variant *read_variant(int argc, char **argv, NMEM nmem,
 	else if (d1_isdigit(*value))
 	{
 	    t->which = Z_Triple_integer;
-	    t->value.integer = (int *)
-		nmem_malloc(nmem, sizeof(*t->value.integer));
-	    *t->value.integer = atoi(value);
+	    t->value.integer = nmem_intdup(nmem, atoi(value));
 	}
 	else
 	{
 	    t->which = Z_Triple_internationalString;
-	    t->value.internationalString = (char *)
-		nmem_malloc(nmem, strlen(value)+1);
-	    strcpy(t->value.internationalString, value);
+	    t->value.internationalString = nmem_strdup(nmem, value);
 	}
     }
     return r;
@@ -103,8 +98,7 @@ static Z_Occurrences *read_occurrences(char *occ, NMEM nmem,
 	op->which = Z_Occurrences_values;
 	op->u.values = (Z_OccurValues *)
 	    nmem_malloc(nmem, sizeof(Z_OccurValues));
-	op->u.values->start = (int *)nmem_malloc(nmem, sizeof(int));
-	*op->u.values->start = 1;
+	op->u.values->start = nmem_intdup(nmem, 1);
 	op->u.values->howMany = 0;
     }
     else if (!strcmp(occ, "all"))
@@ -129,13 +123,9 @@ static Z_Occurrences *read_occurrences(char *occ, NMEM nmem,
 	}
 	op->which = Z_Occurrences_values;
 	op->u.values = ov;
-	ov->start = (int *)nmem_malloc(nmem, sizeof(*ov->start));
-	*ov->start = atoi(occ);
+	ov->start = nmem_intdup(nmem, atoi(occ));
 	if ((p = strchr(occ, '+')))
-	{
-	    ov->howMany = (int *)nmem_malloc(nmem, sizeof(*ov->howMany));
-	    *ov->howMany = atoi(p + 1);
-	}
+	    ov->howMany = nmem_intdup(nmem, atoi(p + 1));
 	else
 	    ov->howMany = 0;
     }
@@ -176,30 +166,44 @@ static Z_ETagUnit *read_tagunit(char *buf, NMEM nmem,
 	{
 	    valp++;
 	    force_string = 1;
+	    if (*valp && valp[strlen(valp)-1] == '\'')
+		*valp = '\0';
 	}
 	u->which = Z_ETagUnit_specificTag;
 	u->u.specificTag = t = (Z_SpecificTag *)nmem_malloc(nmem, sizeof(*t));
-	t->tagType = (int *)nmem_malloc(nmem, sizeof(*t->tagType));
-	*t->tagType = type;
+	t->tagType = nmem_intdup(nmem, type);
 	t->tagValue = (Z_StringOrNumeric *)
 	    nmem_malloc(nmem, sizeof(*t->tagValue));
-	if (!force_string && (numval = atoi(valp)))
+	if (!force_string && isdigit(*(unsigned char *)valp))
 	{
+	    numval = atoi(valp);
 	    t->tagValue->which = Z_StringOrNumeric_numeric;
-	    t->tagValue->u.numeric = (int *)nmem_malloc(nmem, sizeof(int));
-	    *t->tagValue->u.numeric = numval;
+	    t->tagValue->u.numeric = nmem_intdup(nmem, numval);
 	}
 	else
 	{
 	    t->tagValue->which = Z_StringOrNumeric_string;
-	    t->tagValue->u.string = (char *)nmem_malloc(nmem, strlen(valp)+1);
-	    strcpy(t->tagValue->u.string, valp);
+	    t->tagValue->u.string = nmem_strdup(nmem, valp);
 	}
 	if (terms > 2) /* an occurrences-spec exists */
 	    t->occurrences = read_occurrences(occ, nmem, file, lineno);
 	else
 	    t->occurrences = 0;
     }
+    else if ((terms = sscanf(buf, "%511[^)]", value)) >= 1)
+    {
+	Z_SpecificTag *t;
+	char *valp = value;
+
+	u->which = Z_ETagUnit_specificTag;
+	u->u.specificTag = t = (Z_SpecificTag *)nmem_malloc(nmem, sizeof(*t));
+	t->tagType = nmem_intdup(nmem, 3);
+	t->tagValue = (Z_StringOrNumeric *)
+	    nmem_malloc(nmem, sizeof(*t->tagValue));
+	t->tagValue->which = Z_StringOrNumeric_string;
+	t->tagValue->u.string = nmem_strdup(nmem, valp);
+	t->occurrences = read_occurrences("all", nmem, file, lineno);
+    }
     else
     {
 	return 0;
@@ -250,9 +254,7 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
 		(char **)nmem_malloc(nmem, sizeof(char**)*nnames);
 	    for (i = 0; i < nnames; i++)
 	    {
-		res->elementSetNames[i] = (char *)
-		    nmem_malloc(nmem, strlen(argv[i+1])+1);
-		strcpy(res->elementSetNames[i], argv[i+1]);
+		res->elementSetNames[i] = nmem_strdup(nmem, argv[i+1]);
 	    }
 	    res->num_elementSetNames = nnames;
 	}
@@ -280,8 +282,7 @@ Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file)
 			file, lineno, argv[0]);
 		continue;
 	    }
-	    res->defaultTagType = (int *)nmem_malloc(nmem, sizeof(int));
-	    *res->defaultTagType = atoi(argv[1]);
+	    res->defaultTagType = nmem_intdup(nmem, atoi(argv[1]));
 	}
 	else if (!strcmp(argv[0], "defaultvariantrequest"))
 	{