/*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-2002, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Log: d1_absyn.c,v $
- * Revision 1.12 1997-09-17 12:10:34 adam
- * YAZ version 1.4.
- *
- * Revision 1.11 1997/09/05 09:50:55 adam
- * Removed global data1_tabpath - uses data1_get_tabpath() instead.
- *
- * Revision 1.10 1997/05/14 06:54:01 adam
- * C++ support.
- *
- * Revision 1.9 1997/02/19 14:46:15 adam
- * The "all" specifier only affects elements that are indexed (and not
- * all elements).
- *
- * Revision 1.8 1997/01/02 10:47:59 quinn
- * Added optional, physical ANY
- *
- * Revision 1.7 1996/06/10 08:56:01 quinn
- * Work on Summary.
- *
- * Revision 1.6 1996/05/31 13:52:21 quinn
- * Fixed uninitialized variable for local tags in abstract syntax.
- *
- * Revision 1.5 1996/05/09 07:27:43 quinn
- * Multiple local attributes values supported.
- *
- * Revision 1.4 1996/05/01 12:45:28 quinn
- * Support use of local tag names in abs file.
- *
- * Revision 1.3 1995/11/01 16:34:55 quinn
- * Making data1 look for tables in data1_tabpath
- *
- * Revision 1.2 1995/11/01 13:54:44 quinn
- * Minor adjustments
- *
- * Revision 1.1 1995/11/01 11:56:06 quinn
- * Added Retrieval (data management) functions en masse.
- *
- *
+ * $Id: d1_absyn.c,v 1.34 2002-08-29 21:26:08 mike Exp $
*/
-#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
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);
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];
NMEM mem = data1_nmem_get (dh);
- data1_absyn_cache p = nmem_malloc (mem, sizeof(*p));
+ data1_absyn_cache p = (data1_absyn_cache)nmem_malloc (mem, sizeof(*p));
data1_absyn_cache *pp = data1_absyn_cache_get (dh);
sprintf(fname, "%s.abs", name);
- p->absyn = data1_read_absyn (dh, fname);
+ p->absyn = data1_read_absyn (dh, fname, 0);
p->name = nmem_strdup (mem, name);
p->next = *pp;
*pp = p;
return p->absyn;
}
-data1_absyn *data1_get_absyn (data1_handle dh, char *name)
+data1_absyn *data1_get_absyn (data1_handle dh, const char *name)
{
data1_absyn *absyn;
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,
- char *name)
+ const char *name)
{
data1_esetname *r;
data1_element *data1_getelementbytagname (data1_handle dh, data1_absyn *abs,
data1_element *parent,
- char *tagname)
+ const char *tagname)
{
data1_element *r;
+ /* It's now possible to have a data1 tree with no abstract syntax */
+ if ( !abs )
+ return 0;
+
if (!parent)
- r = abs->elements;
+ r = abs->main_elements;
else
r = parent->children;
+
for (; r; r = r->next)
{
data1_name *n;
}
data1_element *data1_getelementbyname (data1_handle dh, data1_absyn *absyn,
- char *name)
+ const char *name)
{
data1_element *r;
- for (r = absyn->elements; r; r = r->next)
+ /* It's now possible to have a data1 tree with no abstract syntax */
+ if ( !absyn )
+ return 0;
+ for (r = absyn->main_elements; r; r = r->next)
if (!data1_matchstr(r->name, name))
return r;
return 0;
}
-data1_absyn *data1_read_absyn (data1_handle dh, const char *file)
+
+void fix_element_ref (data1_handle dh, data1_absyn *absyn, data1_element *e)
{
- char line[512], *r, cmd[512], args[512];
+ /* 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)
+ {
+ if (e->children)
+ fix_element_ref (dh, absyn, e->children);
+ }
+ else
+ {
+ data1_sub_elements *sub_e = absyn->sub_elements;
+ while (sub_e && strcmp (e->sub_name, sub_e->name))
+ sub_e = sub_e->next;
+ if (sub_e)
+ e->children = sub_e->elements;
+ else
+ 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;
+ }
+ 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;
+ }
+ 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,
+ int file_must_exist)
+{
+ data1_sub_elements *cur_elements = NULL;
data1_absyn *res = 0;
FILE *f;
- data1_element **ppl[D1_MAX_NESTING], *cur[D1_MAX_NESTING];
+ data1_element **ppl[D1_MAX_NESTING];
data1_esetname **esetpp;
data1_maptab **maptabp;
data1_marctab **marcp;
data1_termlist *all = 0;
+ data1_attset_child **attset_childp;
+ data1_tagset **tagset_childp;
int level = 0;
+ int lineno = 0;
+ int argc;
+ char *argv[50], line[512];
- if (!(f = yaz_path_fopen(data1_get_tabpath (dh), file, "r")))
+ if (!(f = data1_path_fopen(dh, file, "r")))
{
- logf(LOG_WARN|LOG_ERRNO, "%s", file);
- return 0;
+ yaz_log(LOG_WARN|LOG_ERRNO, "Couldn't open %s", file);
+ if (file_must_exist)
+ return 0;
}
-
- res = 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;
+ res->encoding = 0;
+ res->enable_xpath_indexing = (f ? 0 : 1);
+ tagset_childp = &res->tagset;
+
+ res->attset = data1_empty_attset (dh);
+ attset_childp = &res->attset->children;
+
res->varset = 0;
res->esetnames = 0;
+ esetpp = &res->esetnames;
res->maptabs = 0;
maptabp = &res->maptabs;
res->marc = 0;
marcp = &res->marc;
- res->elements = 0;
- ppl[0] = &res->elements;
- cur[0] = 0;
- esetpp = &res->esetnames;
- for (;;)
+ res->sub_elements = NULL;
+ res->main_elements = NULL;
+
+ while (f && (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)
- {
- fclose(f);
- return res;
- }
- if (sscanf(r, "%s %[^\n]", cmd, args) < 2)
- *args = '\0';
- if (!strcmp(cmd, "elm"))
+ char *cmd = *argv;
+ if (!strcmp(cmd, "elm") || !strcmp(cmd, "element"))
{
data1_element *new_element;
int i;
- char path[512], name[512], termlists[512], *p;
+ char *p, *sub_p, *path, *name, *termlists;
int type, value;
data1_termlist **tp;
- if (sscanf(args, "%511s %511s %511s", path, name, termlists) < 3)
+ if (argc < 4)
{
- logf(LOG_WARN, "Bad # of args to elm in %s: '%s'",
- file, args);
- fclose(f);
- return 0;
+ 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->next = res->sub_elements;
+ cur_elements->elements = NULL;
+ cur_elements->name = "main";
+ res->sub_elements = cur_elements;
+
+ level = 0;
+ ppl[level] = &cur_elements->elements;
+ }
p = path;
- for (i = 0;; i++)
+ for (i = 1;; i++)
{
char *e;
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 = cur[level] = *ppl[level] =
+ 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->parent = level ? cur[level - 1] : 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])
+ {
+ *sub_p++ = '\0';
+ new_element->sub_name =
+ nmem_strdup (data1_nmem_get(dh), sub_p);
+ }
/* well-defined tag */
if (sscanf(p, "(%d,%d)", &type, &value) == 2)
{
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;
}
else if (*p)
{
data1_tag *nt =
- new_element->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 = xstrdup(p);
- nt->names = nmem_malloc(data1_nmem_get(dh),
- sizeof(*new_element->tag->names));
+ 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->name = nt->value.string;
nt->names->next = 0;
nt->kind = DATA1K_string;
}
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 = 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 = DATA1S_word;
- else if (!data1_matchstr(structure, "w"))
- (*tp)->structure = DATA1S_word;
- else if (!data1_matchstr(structure, "p"))
- (*tp)->structure = DATA1S_phrase;
-
- tp = &(*tp)->next;
- }
- while ((p = strchr(p, ',')) && *(++p));
*tp = all; /* append any ALL entries to the list */
}
-
- new_element->name = xstrdup(name);
+ new_element->name = nmem_strdup(data1_nmem_get (dh), name);
}
+ else if (!strcmp(cmd, "section"))
+ {
+ char *name;
+
+ if (argc < 2)
+ {
+ yaz_log(LOG_WARN, "%s:%d: Bad # of args to section",
+ file, lineno);
+ continue;
+ }
+ 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, "xpath"))
+ {
+ if (argc != 2)
+ {
+ yaz_log(LOG_WARN, "%s:%d: Bad # of args to 'xpath' directive",
+ file, lineno);
+ continue;
+ }
+ if (!strcmp(argv[1], "enable"))
+ res->enable_xpath_indexing = 1;
+ else if (!strcmp (argv[1], "disable"))
+ res->enable_xpath_indexing = 0;
+ else
+ {
+ yaz_log(LOG_WARN, "%s:%d: Expecting disable/enable "
+ "after 'xpath' directive", file, lineno);
+ }
+ }
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 = 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 = DATA1S_word;
- else if (!data1_matchstr(structure, "w"))
- (*tp)->structure = DATA1S_word;
- else if (!data1_matchstr(structure, "p"))
- (*tp)->structure = DATA1S_phrase;
-
- (*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, "%s", name))
+ if (argc != 2)
{
- logf(LOG_WARN, "%s 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), args);
+ 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, "%s malformed reference directive 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, "%s 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, "%s 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, "%s 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, "%s: Two arg's required for esetname directive");
- fclose(f);
- return 0;
+ yaz_log(LOG_WARN, "%s:%d: Bad # of args in esetname",
+ file, lineno);
+ continue;
}
- *esetpp = 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, 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, "%s: One argument required for maptab directive",
- 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, "%s: Failed to read maptab.");
+ 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, "%s: One argument required for marc directive",
- 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, "%s: Failed to read marctab.");
+ yaz_log(LOG_WARN, "%s:%d: Couldn't read marctab %s",
+ file, lineno, name);
continue;
}
marcp = &(*marcp)->next;
}
+ else if (!strcmp(cmd, "encoding"))
+ {
+ if (argc != 2)
+ {
+ yaz_log(LOG_WARN, "%s:%d: Bad # or args for encoding",
+ file, lineno);
+ continue;
+ }
+ res->encoding = nmem_strdup (data1_nmem_get(dh), argv[1]);
+ }
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;
}
}
+ if (f)
+ fclose(f);
+
+ for (cur_elements = res->sub_elements; cur_elements;
+ cur_elements = cur_elements->next)
+ {
+ if (!strcmp (cur_elements->name, "main"))
+ res->main_elements = cur_elements->elements;
+ fix_element_ref (dh, res, cur_elements->elements);
+ }
+ yaz_log (LOG_DEBUG, "%s: data1_read_absyn end", file);
+ return res;
}
projects / yaz-moved-to-github.git / blobdiff