X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_absyn.c;h=75f69bd2ae3aeb6971a078aad0249a1a666074f8;hp=a06ecdcd45d9058b05ca1a994dd36c938318e4fa;hb=7dbfe8eb851425008edcba35173278f1c54fc037;hpb=f4be2b662141a53c7b9a8a9b410b549dfd2bc1fb

diff --git a/retrieval/d1_absyn.c b/retrieval/d1_absyn.c
index a06ecdc..75f69bd 100644
--- a/retrieval/d1_absyn.c
+++ b/retrieval/d1_absyn.c
@@ -1,10 +1,58 @@
 /*
- * Copyright (c) 1995-1998, Index Data.
+ * Copyright (c) 1995-2000, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_absyn.c,v $
- * Revision 1.18  1998-02-27 14:08:04  adam
+ * Revision 1.30  2000-12-05 19:07:24  adam
+ * Fixed problem with element level in reading of abstract syntax.
+ *
+ * Revision 1.29  2000/12/05 14:34:49  adam
+ * Fixed bug with termlists (introduced by previous commit).
+ *
+ * Revision 1.28  2000/12/05 12:21:45  adam
+ * Added termlist source for data1 system.
+ *
+ * Revision 1.27  1999/12/21 14:16:19  ian
+ * Changed retrieval module to allow data1 trees with no associated absyn.
+ * Also added a simple interface for extracting values from data1 trees using
+ * a string based tagpath.
+ *
+ * Revision 1.26  1999/11/30 13:47:12  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.25  1999/10/21 12:06:29  adam
+ * Retrieval module no longer uses ctype.h - functions.
+ *
+ * Revision 1.24  1999/08/27 09:40:32  adam
+ * Renamed logf function to yaz_log. Removed VC++ project files.
+ *
+ * Revision 1.23  1998/10/15 08:29:16  adam
+ * Tag set type may be specified in reference to it using "tagset"
+ * directive in .abs-files and "include" directive in .tag-files.
+ *
+ * Revision 1.22  1998/10/13 16:09:47  adam
+ * Added support for arbitrary OID's for tagsets, schemas and attribute sets.
+ * Added support for multiple attribute set references and tagset references
+ * from an abstract syntax file.
+ * Fixed many bad logs-calls in routines that read the various
+ * specifications regarding data1 (*.abs,*.att,...) and made the messages
+ * consistent whenever possible.
+ * Added extra 'lineno' argument to function readconf_line.
+ *
+ * Revision 1.21  1998/06/09 13:55:07  adam
+ * Minor changes.
+ *
+ * Revision 1.20  1998/05/18 13:07:02  adam
+ * Changed the way attribute sets are handled by the retriaval module.
+ * Extended Explain conversion / schema.
+ * Modified server and client to work with ASN.1 compiled protocol handlers.
+ *
+ * Revision 1.19  1998/03/05 08:15:32  adam
+ * Implemented data1_add_insert_taggeddata utility which is more flexible
+ * than data1_insert_taggeddata.
+ *
+ * Revision 1.18  1998/02/27 14:08:04  adam
  * Added const to some char pointer arguments.
  * Reworked data1_read_node so that it doesn't create a tree with
  * pointers to original "SGML"-buffer.
@@ -66,20 +114,16 @@
  * Revision 1.1  1995/11/01  11:56:06  quinn
  * Added Retrieval (data management) functions en masse.
  *
- *
  */
 
-#include <ctype.h>
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <oid.h>
-#include <log.h>
-#include <tpath.h>
-
-#include <data1.h>
+#include <yaz/oid.h>
+#include <yaz/log.h>
+#include <yaz/data1.h>
 
 #define D1_MAX_NESTING  128
 
@@ -90,6 +134,13 @@ struct data1_absyn_cache_info
     data1_absyn_cache next;
 };
 
+struct data1_attset_cache_info 
+{
+    char *name;
+    data1_attset *attset;
+    data1_attset_cache next;
+};
+
 data1_absyn *data1_absyn_search (data1_handle dh, const char *name)
 {
     data1_absyn_cache p = *data1_absyn_cache_get (dh);
@@ -103,6 +154,18 @@ data1_absyn *data1_absyn_search (data1_handle dh, const char *name)
     return NULL;
 }
 
+void data1_absyn_trav (data1_handle dh, void *handle,
+		       void (*fh)(data1_handle dh, void *h, data1_absyn *a))
+{
+    data1_absyn_cache p = *data1_absyn_cache_get (dh);
+
+    while (p)
+    {
+	(*fh)(dh, handle, p->absyn);
+	p = p->next;
+    }
+}
+
 data1_absyn *data1_absyn_add (data1_handle dh, const char *name)
 {
     char fname[512];
@@ -128,6 +191,73 @@ data1_absyn *data1_get_absyn (data1_handle dh, const char *name)
     return absyn;
 }
 
+data1_attset *data1_attset_search_name (data1_handle dh, const char *name)
+{
+    data1_attset_cache p = *data1_attset_cache_get (dh);
+
+    while (p)
+    {
+	if (!strcmp (name, p->name))
+	    return p->attset;
+	p = p->next;
+    }
+    return NULL;
+}
+
+data1_attset *data1_attset_search_id (data1_handle dh, int id)
+{
+    data1_attset_cache p = *data1_attset_cache_get (dh);
+
+    while (p)
+    {
+	if (id == p->attset->reference)
+	    return p->attset;
+	p = p->next;
+    }
+    return NULL;
+}
+
+data1_attset *data1_attset_add (data1_handle dh, const char *name)
+{
+    char fname[512], aname[512];
+    NMEM mem = data1_nmem_get (dh);
+    data1_attset *attset;
+
+    strcpy (aname, name);
+    sprintf(fname, "%s.att", name);
+    attset = data1_read_attset (dh, fname);
+    if (!attset)
+    {
+	char *cp;
+	attset = data1_read_attset (dh, name);
+	if (attset && (cp = strrchr (aname, '.')))
+	    *cp = '\0';
+    }
+    if (!attset)
+	yaz_log (LOG_WARN|LOG_ERRNO, "Couldn't load attribute set %s", name);
+    else
+    {
+	data1_attset_cache p = (data1_attset_cache)
+	    nmem_malloc (mem, sizeof(*p));
+	data1_attset_cache *pp = data1_attset_cache_get (dh);
+	
+	attset->name = p->name = nmem_strdup (mem, aname);
+	p->attset = attset;
+	p->next = *pp;
+	*pp = p;
+    }
+    return attset;
+}
+
+data1_attset *data1_get_attset (data1_handle dh, const char *name)
+{
+    data1_attset *attset;
+
+    if (!(attset = data1_attset_search_name (dh, name)))
+	attset = data1_attset_add (dh, name);
+    return attset;
+}
+
 data1_esetname *data1_getesetbyname(data1_handle dh, data1_absyn *a,
 				    const char *name)
 {
@@ -145,6 +275,10 @@ data1_element *data1_getelementbytagname (data1_handle dh, data1_absyn *abs,
 {
     data1_element *r;
 
+    /* It's now possible to have a data1 tree with no abstract syntax */
+    if ( !abs )
+        return 0;
+
     if (!parent)
         r = abs->main_elements;
     else
@@ -165,6 +299,11 @@ data1_element *data1_getelementbyname (data1_handle dh, data1_absyn *absyn,
 				       const char *name)
 {
     data1_element *r;
+
+    /* It's now possible to have a data1 tree with no abstract syntax */
+    if ( !absyn )
+        return 0;
+    
     assert (absyn->main_elements);
     for (r = absyn->main_elements; r; r = r->next)
 	if (!data1_matchstr(r->name, name))
@@ -175,6 +314,10 @@ data1_element *data1_getelementbyname (data1_handle dh, data1_absyn *absyn,
 
 void fix_element_ref (data1_handle dh, data1_absyn *absyn, data1_element *e)
 {
+    /* It's now possible to have a data1 tree with no abstract syntax */
+    if ( !absyn )
+        return;
+
     for (; e; e = e->next)
     {
 	if (!e->sub_name)
@@ -190,15 +333,74 @@ void fix_element_ref (data1_handle dh, data1_absyn *absyn, data1_element *e)
 	    if (sub_e)
 		e->children = sub_e->elements;
 	    else
-		logf (LOG_WARN, "Unresolved reference to sub-elements %s",
+		yaz_log (LOG_WARN, "Unresolved reference to sub-elements %s",
 		      e->sub_name);
 	}
     }
 }
 
+
+static int parse_termlists (data1_handle dh, data1_termlist ***tpp,
+			    char *p, const char *file, int lineno,
+			    const char *element_name, data1_absyn *res)
+{
+    data1_termlist **tp = *tpp;
+    do
+    {
+	char attname[512], structure[512];
+	char *source;
+	int r;
+	
+	if (!(r = sscanf(p, "%511[^:,]:%511[^,]", attname,
+			 structure)))
+	{
+	    yaz_log(LOG_WARN,
+		    "%s:%d: Syntax error in termlistspec '%s'",
+		    file, lineno, p);
+	    return -1;
+/*
+  fclose(f);
+  return 0;
+*/
+	}
+	if (*attname == '!')
+	    strcpy(attname, element_name);
+	*tp = (data1_termlist *)
+	    nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
+	(*tp)->next = 0;
+	if (!((*tp)->att = data1_getattbyname(dh, res->attset,
+					      attname)))
+	{
+	    yaz_log(LOG_WARN,
+		    "%s:%d: Couldn't find att '%s' in attset",
+		    file, lineno, attname);
+	    return -1;
+/*
+	    fclose(f);
+	    return 0;
+*/
+	}
+	if (r == 2 && (source = strchr(structure, ':')))
+	    *source++ = '\0';   /* cut off structure .. */
+	else
+	    source = "data";    /* ok: default is leaf data */
+	(*tp)->source = (char *)
+	    nmem_strdup (data1_nmem_get (dh), source);
+	
+	if (r < 2) /* is the structure qualified? */
+	    (*tp)->structure = "w";
+	else 
+	    (*tp)->structure = (char *)
+		nmem_strdup (data1_nmem_get (dh), structure);
+	tp = &(*tp)->next;
+    }
+    while ((p = strchr(p, ',')) && *(++p));
+    *tpp = tp;
+    return 0;
+}
+
 data1_absyn *data1_read_absyn (data1_handle dh, const char *file)
 {
-    char line[512], *r, cmd[512], args[512];
     data1_sub_elements *cur_elements = NULL;
     data1_absyn *res = 0;
     FILE *f;
@@ -207,20 +409,28 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file)
     data1_maptab **maptabp;
     data1_marctab **marcp;
     data1_termlist *all = 0;
-    int level;
+    data1_attset_child **attset_childp;
+    data1_tagset **tagset_childp;
+    int level = 0;
+    int lineno = 0;
+    int argc;
+    char *argv[50], line[512];
 
-    logf (LOG_DEBUG, "begin data1_read_absyn file=%s", file);
     if (!(f = yaz_path_fopen(data1_get_tabpath (dh), file, "r")))
     {
-	logf(LOG_WARN|LOG_ERRNO, "Couldn't open %s", file);
+	yaz_log(LOG_WARN|LOG_ERRNO, "Couldn't open %s", file);
 	return 0;
     }
-
-    res = (data1_absyn *)nmem_malloc(data1_nmem_get(dh), sizeof(*res));
+    
+    res = (data1_absyn *) nmem_malloc(data1_nmem_get(dh), sizeof(*res));
     res->name = 0;
     res->reference = VAL_NONE;
     res->tagset = 0;
-    res->attset = 0;
+    tagset_childp = &res->tagset;
+
+    res->attset = data1_empty_attset (dh);
+    attset_childp =  &res->attset->children;
+
     res->varset = 0;
     res->esetnames = 0;
     esetpp = &res->esetnames;
@@ -232,48 +442,40 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file)
     res->sub_elements = NULL;
     res->main_elements = NULL;
 
-    for (;;)
+    while ((argc = readconf_line(f, &lineno, line, 512, argv, 50)))
     {
-	while ((r = fgets(line, 512, f)))
-	{
-	    while (*r && isspace(*r))
-		r++;
-	    if (*r && *r != '#')
-		break;
-	}
-	if (!r)
-            break;
-	if (sscanf(r, "%s %[^\n]", cmd, args) < 2)
-	    *args = '\0';
+	char *cmd = *argv;
 	if (!strcmp(cmd, "elm"))
 	{
 	    data1_element *new_element;
 	    int i;
-	    char path[512], name[512], termlists[512], *p, *sub_p;
+	    char *p, *sub_p, *path, *name, *termlists;
 	    int type, value;
 	    data1_termlist **tp;
 
+	    if (argc < 4)
+	    {
+		yaz_log(LOG_WARN, "%s:%d: Bad # of args to elm", file, lineno);
+		continue;
+	    }
+	    path = argv[1];
+	    name = argv[2];
+	    termlists = argv[3];
+
 	    if (!cur_elements)
 	    {
-                cur_elements = (data1_sub_elements *)nmem_malloc(data1_nmem_get(dh),
-				    	   sizeof(*cur_elements));
+                cur_elements = (data1_sub_elements *)
+		    nmem_malloc(data1_nmem_get(dh), sizeof(*cur_elements));
 	        cur_elements->next = res->sub_elements;
 		cur_elements->elements = NULL;
 		cur_elements->name = "main";
 		res->sub_elements = cur_elements;
-
+		
 		level = 0;
     		ppl[level] = &cur_elements->elements;
             }
-	    if (sscanf(args, "%511s %511s %511s", path, name, termlists) < 3)
-	    {
-		logf(LOG_WARN, "Bad # of args to elm in %s: '%s'", 
-		    file, args);
-		fclose(f);
-		return 0;
-	    }
 	    p = path;
-	    for (i = 0;; i++)
+	    for (i = 1;; i++)
 	    {
 		char *e;
 
@@ -282,24 +484,24 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file)
 		else
 		    break;
 	    }
-	    if (i > level + 1)
+	    if (i > level+1)
 	    {
-		logf(LOG_WARN, "Bad level inc in %s in '%s'", file, args);
+		yaz_log(LOG_WARN, "%s:%d: Bad level increase", file, lineno);
 		fclose(f);
 		return 0;
 	    }
 	    level = i;
-	    new_element = *ppl[level] =
-		(data1_element *)nmem_malloc(data1_nmem_get(dh), sizeof(*new_element));
+	    new_element = *ppl[level-1] = (data1_element *)
+		nmem_malloc(data1_nmem_get(dh), sizeof(*new_element));
 	    new_element->next = new_element->children = 0;
 	    new_element->tag = 0;
 	    new_element->termlists = 0;
 	    new_element->sub_name = 0;
-
+	    
 	    tp = &new_element->termlists;
-	    ppl[level] = &new_element->next;
-	    ppl[level+1] = &new_element->children;
-
+	    ppl[level-1] = &new_element->next;
+	    ppl[level] = &new_element->children;
+	    
 	    /* consider subtree (if any) ... */
 	    if ((sub_p = strchr (p, ':')) && sub_p[1])
 	    {
@@ -312,15 +514,15 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file)
 	    {
 		if (!res->tagset)
 		{
-		    logf(LOG_WARN, "No tagset loaded in %s", file);
+		    yaz_log(LOG_WARN, "%s:%d: No tagset loaded", file, lineno);
 		    fclose(f);
 		    return 0;
 		}
 		if (!(new_element->tag = data1_gettagbynum (dh, res->tagset,
 							    type, value)))
 		{
-		    logf(LOG_WARN, "Couldn't find tag %s in tagset in %s",
-			p, file);
+		    yaz_log(LOG_WARN, "%s:%d: Couldn't find tag %s in tagset",
+			 file, lineno, p);
 		    fclose(f);
 		    return 0;
 		}
@@ -329,12 +531,14 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file)
 	    else if (*p)
 	    {
 		data1_tag *nt =
-		    new_element->tag = (data1_tag *)nmem_malloc(data1_nmem_get (dh),
-						   sizeof(*new_element->tag));
+		    new_element->tag = (data1_tag *)
+		    nmem_malloc(data1_nmem_get (dh),
+				sizeof(*new_element->tag));
 		nt->which = DATA1T_string;
 		nt->value.string = nmem_strdup(data1_nmem_get (dh), p);
-		nt->names = (data1_name *)nmem_malloc(data1_nmem_get(dh), 
-					sizeof(*new_element->tag->names));
+		nt->names = (data1_name *)
+		    nmem_malloc(data1_nmem_get(dh), 
+				sizeof(*new_element->tag->names));
 		nt->names->name = nt->value.string;
 		nt->names->next = 0;
 		nt->kind = DATA1K_string;
@@ -343,280 +547,229 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file)
 	    }
 	    else
 	    {
-		logf(LOG_WARN, "Bad element is %s", file);
+		yaz_log(LOG_WARN, "%s:%d: Bad element", file, lineno);
 		fclose(f);
 		return 0;
 	    }
 	    /* parse termList definitions */
 	    p = termlists;
-	    if (*p == '-')
-		new_element->termlists = 0;
-	    else
+	    if (*p != '-')
 	    {
-		if (!res->attset)
+		assert (res->attset);
+		
+		if (parse_termlists (dh, &tp, p, file, lineno, name, res))
 		{
-		    logf(LOG_WARN, "No attset loaded in %s", file);
-		    fclose(f);
+		    fclose (f);
 		    return 0;
 		}
-		do
-		{
-		    char attname[512], structure[512];
-		    int r;
-
-		    if (!(r = sscanf(p, "%511[^:,]:%511[^,]", attname,
-			structure)))
-		    {
-			logf(LOG_WARN, "Syntax error in termlistspec in %s",
-			    file);
-			fclose(f);
-			return 0;
-		    }
-		    if (*attname == '!')
-			strcpy(attname, name);
-		    *tp = (data1_termlist *)nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
-		    (*tp)->next = 0;
-		    if (!((*tp)->att = data1_getattbyname(dh, res->attset,
-							  attname)))
-		    {
-			logf(LOG_WARN, "Couldn't find att '%s' in attset",
-			     attname);
-			fclose(f);
-			return 0;
-		    }
-		    if (r < 2) /* is the structure qualified? */
-			(*tp)->structure = "w";
-		    else 
-		    {
-			(*tp)->structure = (char *)nmem_malloc (data1_nmem_get (dh),
-							strlen(structure)+1);
-			strcpy ((*tp)->structure, structure);
-		    }
-		    tp = &(*tp)->next;
-		}
-		while ((p = strchr(p, ',')) && *(++p));
 	        *tp = all; /* append any ALL entries to the list */
 	    }
 	    new_element->name = nmem_strdup(data1_nmem_get (dh), name);
 	}
  	else if (!strcmp(cmd, "section"))
 	{
-	    char name[512];
-	    if (sscanf(args, "%511s", name) < 1)
+	    char *name;
+	    
+	    if (argc < 2)
 	    {
-		logf(LOG_WARN, "Bad # of args to sub in %s: '%s'",
-                                file, args);
+		yaz_log(LOG_WARN, "%s:%d: Bad # of args to section",
+		     file, lineno);
 		continue;
 	    }
-            cur_elements = (data1_sub_elements *)nmem_malloc(data1_nmem_get(dh),
-				    	   sizeof(*cur_elements));
+	    name = argv[1];
+	    
+            cur_elements = (data1_sub_elements *)
+		nmem_malloc(data1_nmem_get(dh), sizeof(*cur_elements));
 	    cur_elements->next = res->sub_elements;
 	    cur_elements->elements = NULL;
 	    cur_elements->name = nmem_strdup (data1_nmem_get(dh), name);
 	    res->sub_elements = cur_elements;
-
+	    
 	    level = 0;
     	    ppl[level] = &cur_elements->elements;
 	}
 	else if (!strcmp(cmd, "all"))
 	{
-	    char *p;
 	    data1_termlist **tp = &all;
-
 	    if (all)
 	    {
-		logf(LOG_WARN, "Too many ALL declarations in %s - ignored",
-		    file);
+		yaz_log(LOG_WARN, "%s:%d: Too many 'all' directives - ignored",
+		     file, lineno);
 		continue;
 	    }
-
-	    p = args;
-	    if (!res->attset)
+	    if (argc != 2)
 	    {
-		logf(LOG_WARN, "No attset loaded in %s", file);
-		fclose(f);
-		return 0;
+		yaz_log(LOG_WARN, "%s:%d: Bad # of args to 'all' directive",
+		     file, lineno);
+		continue;
 	    }
-	    do
+	    if (parse_termlists (dh, &tp, argv[1], file, lineno, 0, res))
 	    {
-		char attname[512], structure[512];
-		int r;
-
-		if (!(r = sscanf(p, "%511[^:,]:%511[^,]", attname,
-		    structure)))
-		{
-		    logf(LOG_WARN, "Syntax error in termlistspec in %s",
-			file);
-		    fclose(f);
-		    return 0;
-		}
-		*tp = (data1_termlist *)nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
-		if (!((*tp)->att = data1_getattbyname (dh, res->attset,
-						       attname)))
-		{
-		    logf(LOG_WARN, "Couldn't find att '%s' in attset",
-			 attname);
-		    fclose(f);
-		    return 0;
-		}
-		if (r < 2) /* is the structure qualified? */
-		    (*tp)->structure = "w";
-		else 
-		{
-		    (*tp)->structure = (char *)nmem_malloc (data1_nmem_get (dh),
-						    strlen(structure)+1);
-		    strcpy ((*tp)->structure, structure);
-		}
-		(*tp)->next = 0;
-		tp = &(*tp)->next;
+		fclose (f);
+		return 0;
 	    }
-	    while ((p = strchr(p, ',')) && *(++p));
 	}
 	else if (!strcmp(cmd, "name"))
 	{
-	    char name[512];
-
-	    if (!sscanf(args, "%511s", name))
+	    if (argc != 2)
 	    {
-		logf(LOG_WARN, "Malformed name directive in %s", file);
-		fclose(f);
-		return 0;
+		yaz_log(LOG_WARN, "%s:%d: Bad # of args to name directive",
+		     file, lineno);
+		continue;
 	    }
-	    res->name = nmem_strdup(data1_nmem_get(dh), name);
+	    res->name = nmem_strdup(data1_nmem_get(dh), argv[1]);
 	}
 	else if (!strcmp(cmd, "reference"))
 	{
-	    char name[512];
-
-	    if (!sscanf(args, "%s", name))
+	    char *name;
+	    
+	    if (argc != 2)
 	    {
-		logf(LOG_WARN, "Malformed reference in %s", file);
-		fclose(f);
-		return 0;
+		yaz_log(LOG_WARN, "%s:%d: Bad # of args to reference",
+		     file, lineno);
+		continue;
 	    }
+	    name = argv[1];
 	    if ((res->reference = oid_getvalbyname(name)) == VAL_NONE)
 	    {
-		logf(LOG_WARN, "Unknown tagset ref '%s' in %s", name, file);
-		fclose(f);
-		return 0;
+		yaz_log(LOG_WARN, "%s:%d: Unknown tagset ref '%s'", 
+		     file, lineno, name);
+		continue;
 	    }
 	}
 	else if (!strcmp(cmd, "attset"))
 	{
-	    char name[512];
-
-	    if (!sscanf(args, "%s", name))
+	    char *name;
+	    data1_attset *attset;
+	    
+	    if (argc != 2)
 	    {
-		logf(LOG_WARN, "Malformed attset directive in %s", file);
-		fclose(f);
-		return 0;
+		yaz_log(LOG_WARN, "%s:%d: Bad # of args to attset",
+		     file, lineno);
+		continue;
 	    }
-	    if (!(res->attset = data1_read_attset (dh, name)))
+	    name = argv[1];
+	    if (!(attset = data1_get_attset (dh, name)))
 	    {
-		logf(LOG_WARN, "Attset failed in %s", file);
-		fclose(f);
-		return 0;
+		yaz_log(LOG_WARN, "%s:%d: Couldn't find attset  %s",
+		     file, lineno, name);
+		continue;
 	    }
+	    *attset_childp = (data1_attset_child *)
+		nmem_malloc (data1_nmem_get(dh), sizeof(**attset_childp));
+	    (*attset_childp)->child = attset;
+	    (*attset_childp)->next = 0;
+	    attset_childp = &(*attset_childp)->next;
 	}
 	else if (!strcmp(cmd, "tagset"))
 	{
-	    char name[512];
-
-	    if (!sscanf(args, "%s", name))
+	    char *name;
+	    int type = 0;
+	    if (argc < 2)
 	    {
-		logf(LOG_WARN, "Malformed tagset directive in %s", file);
-		fclose(f);
-		return 0;
+		yaz_log(LOG_WARN, "%s:%d: Bad # of args to tagset",
+		     file, lineno);
+		continue;
 	    }
-	    if (!(res->tagset = data1_read_tagset (dh, name)))
+	    name = argv[1];
+	    if (argc == 3)
+		type = atoi(argv[2]);
+	    *tagset_childp = data1_read_tagset (dh, name, type);
+	    if (!(*tagset_childp))
 	    {
-		logf(LOG_WARN, "Tagset failed in %s", file);
-		fclose(f);
-		return 0;
+		yaz_log(LOG_WARN, "%s:%d: Couldn't load tagset %s",
+		     file, lineno, name);
+		continue;
 	    }
+	    tagset_childp = &(*tagset_childp)->next;
 	}
 	else if (!strcmp(cmd, "varset"))
 	{
-	    char name[512];
+	    char *name;
 
-	    if (!sscanf(args, "%s", name))
+	    if (argc != 2)
 	    {
-		logf(LOG_WARN, "Malformed varset directive in %s", file);
-		fclose(f);
-		return 0;
+		yaz_log(LOG_WARN, "%s:%d: Bad # of args in varset",
+		     file, lineno);
+		continue;
 	    }
+	    name = argv[1];
 	    if (!(res->varset = data1_read_varset (dh, name)))
 	    {
-		logf(LOG_WARN, "Varset failed in %s", file);
-		fclose(f);
-		return 0;
+		yaz_log(LOG_WARN, "%s:%d: Couldn't load Varset %s",
+		     file, lineno, name);
+		continue;
 	    }
 	}
 	else if (!strcmp(cmd, "esetname"))
 	{
-	    char name[512], fname[512];
+	    char *name, *fname;
 
-	    if (sscanf(args, "%s %s", name, fname) != 2)
+	    if (argc != 3)
 	    {
-		logf(LOG_WARN, "Two arg's required for esetname in %s",
-                     file);
-		fclose(f);
-		return 0;
+		yaz_log(LOG_WARN, "%s:%d: Bad # of args in esetname",
+		     file, lineno);
+		continue;
 	    }
-	    *esetpp = (data1_esetname *)nmem_malloc(data1_nmem_get(dh), sizeof(**esetpp));
+	    name = argv[1];
+	    fname = argv[2];
+	    
+	    *esetpp = (data1_esetname *)
+		nmem_malloc(data1_nmem_get(dh), sizeof(**esetpp));
 	    (*esetpp)->name = nmem_strdup(data1_nmem_get(dh), name);
 	    (*esetpp)->next = 0;
 	    if (*fname == '@')
 		(*esetpp)->spec = 0;
 	    else if (!((*esetpp)->spec = data1_read_espec1 (dh, fname)))
 	    {
-		logf(LOG_WARN, "%s: Espec-1 read failed", file);
-		fclose(f);
-		return 0;
+		yaz_log(LOG_WARN, "%s:%d: Espec-1 read failed for %s",
+		     file, lineno, fname);
+		continue;
 	    }
 	    esetpp = &(*esetpp)->next;
 	}
 	else if (!strcmp(cmd, "maptab"))
 	{
-	    char name[512];
-
-	    if (sscanf(args, "%s", name) != 1)
+	    char *name;
+	    
+	    if (argc != 2)
 	    {
-		logf(LOG_WARN, "One argument for maptab directive in %s",
-                     file);
+		yaz_log(LOG_WARN, "%s:%d: Bad # of args for maptab",
+                     file, lineno);
 		continue;
 	    }
+	    name = argv[1];
 	    if (!(*maptabp = data1_read_maptab (dh, name)))
 	    {
-		logf(LOG_WARN, "Failed to read maptab %s in %s",
-                     name, file);
+		yaz_log(LOG_WARN, "%s:%d: Couldn't load maptab %s",
+                     file, lineno, name);
 		continue;
 	    }
 	    maptabp = &(*maptabp)->next;
 	}
 	else if (!strcmp(cmd, "marc"))
 	{
-	    char name[512];
-
-	    if (sscanf(args, "%s", name) != 1)
+	    char *name;
+	    
+	    if (argc != 2)
 	    {
-		logf(LOG_WARN, "One argument for marc directive in %s",
-		    file);
+		yaz_log(LOG_WARN, "%s:%d: Bad # or args for marc",
+		     file, lineno);
 		continue;
 	    }
+	    name = argv[1];
 	    if (!(*marcp = data1_read_marctab (dh, name)))
 	    {
-		logf(LOG_WARN, "%Failed to read marctab %s in %s",
-                     name, file);
+		yaz_log(LOG_WARN, "%s:%d: Couldn't read marctab %s",
+                     file, lineno, name);
 		continue;
 	    }
 	    marcp = &(*marcp)->next;
 	}
 	else
 	{
-	    logf(LOG_WARN, "Unknown directive '%s' in %s", cmd, file);
-	    fclose(f);
-	    return 0;
+	    yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'", file, lineno, cmd);
+	    continue;
 	}
     }
     fclose(f);
@@ -628,6 +781,6 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file)
 	    res->main_elements = cur_elements->elements;
 	fix_element_ref (dh, res, cur_elements->elements);
     }
-    logf (LOG_DEBUG, "end data1_read_absyn file=%s", file);
+    yaz_log (LOG_DEBUG, "%s: data1_read_absyn end", file);
     return res;
 }