/*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_absyn.c,v $
- * Revision 1.15 1997-12-09 16:18:16 adam
+ * 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.
+ *
+ * Revision 1.17 1998/02/11 11:53:34 adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.16 1997/12/18 10:51:30 adam
+ * Implemented sub-trees feature for schemas - including forward
+ * references.
+ *
+ * Revision 1.15 1997/12/09 16:18:16 adam
* Work on EXPLAIN schema. First implementation of sub-schema facility
* in the *.abs files.
*
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);
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;
}
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;
}
data1_element *data1_getelementbyname (data1_handle dh, data1_absyn *absyn,
- char *name)
+ const char *name)
{
data1_element *r;
assert (absyn->main_elements);
return 0;
}
+
+void fix_element_ref (data1_handle dh, data1_absyn *absyn, data1_element *e)
+{
+ 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
+ logf (LOG_WARN, "Unresolved reference to sub-elements %s",
+ e->sub_name);
+ }
+ }
+}
+
data1_absyn *data1_read_absyn (data1_handle dh, const char *file)
{
char line[512], *r, cmd[512], args[512];
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;
{
data1_element *new_element;
int i;
- char path[512], name[512], termlists[512], *p;
+ char path[512], name[512], termlists[512], *p, *sub_p;
int type, value;
data1_termlist **tp;
if (!cur_elements)
{
- cur_elements = nmem_malloc(data1_nmem_get(dh),
+ cur_elements = (data1_sub_elements *)nmem_malloc(data1_nmem_get(dh),
sizeof(*cur_elements));
cur_elements->next = res->sub_elements;
cur_elements->elements = NULL;
return 0;
}
level = i;
- if (*p == '$' && level > 0)
- {
- data1_sub_elements *sub_e = res->sub_elements;
-
- p++;
- while (sub_e && strcmp (p, sub_e->name))
- sub_e = sub_e->next;
- if (sub_e)
- *ppl[level] = sub_e->elements;
- if (level)
- level--;
- continue;
- }
new_element = *ppl[level] =
- nmem_malloc(data1_nmem_get(dh), sizeof(*new_element));
+ (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;
-
+
+ /* 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)
{
else if (*p)
{
data1_tag *nt =
- new_element->tag = nmem_malloc(data1_nmem_get (dh),
+ 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 = nmem_malloc(data1_nmem_get(dh),
+ 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;
fclose(f);
return 0;
}
-
/* parse termList definitions */
p = termlists;
if (*p == '-')
}
if (*attname == '!')
strcpy(attname, name);
- *tp = nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
+ *tp = (data1_termlist *)nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
(*tp)->next = 0;
if (!((*tp)->att = data1_getattbyname(dh, res->attset,
attname)))
(*tp)->structure = "w";
else
{
- (*tp)->structure = nmem_malloc (data1_nmem_get (dh),
+ (*tp)->structure = (char *)nmem_malloc (data1_nmem_get (dh),
strlen(structure)+1);
strcpy ((*tp)->structure, structure);
}
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"))
file, args);
continue;
}
- cur_elements = nmem_malloc(data1_nmem_get(dh),
+ cur_elements = (data1_sub_elements *)nmem_malloc(data1_nmem_get(dh),
sizeof(*cur_elements));
cur_elements->next = res->sub_elements;
cur_elements->elements = NULL;
fclose(f);
return 0;
}
- *tp = nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
+ *tp = (data1_termlist *)nmem_malloc(data1_nmem_get(dh), sizeof(**tp));
if (!((*tp)->att = data1_getattbyname (dh, res->attset,
attname)))
{
(*tp)->structure = "w";
else
{
- (*tp)->structure = nmem_malloc (data1_nmem_get (dh),
+ (*tp)->structure = (char *)nmem_malloc (data1_nmem_get (dh),
strlen(structure)+1);
strcpy ((*tp)->structure, structure);
}
fclose(f);
return 0;
}
- *esetpp = nmem_malloc(data1_nmem_get(dh), sizeof(**esetpp));
+ *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 == '@')
}
}
fclose(f);
-
- cur_elements = res->sub_elements;
- while (cur_elements && strcmp (cur_elements->name, "main"))
- cur_elements = cur_elements->next;
- if (cur_elements)
- res->main_elements = cur_elements->elements;
-
+
+ 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);
+ }
logf (LOG_DEBUG, "end data1_read_absyn file=%s", file);
return res;
}
projects / yaz-moved-to-github.git / blobdiff