X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_absyn.c;h=b38d7aa8b5c7612ef07a49e4ab95632c72504aa3;hb=1f6254e4d56700f2862a549a77daeb6c22d1f8d4;hp=c8479a43234a2af290cdebed3710445d4eceb545;hpb=068a5a7412f492019b4d6f5e89158098d44368f7;p=yaz-moved-to-github.git diff --git a/retrieval/d1_absyn.c b/retrieval/d1_absyn.c index c8479a4..b38d7aa 100644 --- a/retrieval/d1_absyn.c +++ b/retrieval/d1_absyn.c @@ -4,7 +4,15 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_absyn.c,v $ - * Revision 1.14 1997-10-31 12:20:09 adam + * 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. + * + * Revision 1.14 1997/10/31 12:20:09 adam * Improved memory debugging for xmalloc/nmem.c. References to NMEM * instead of ODR in n ESPEC-1 handling in source d1_espec.c. * Bug fix: missing fclose in data1_read_espec1. @@ -130,9 +138,10 @@ data1_element *data1_getelementbytagname (data1_handle dh, data1_absyn *abs, data1_element *r; if (!parent) - r = abs->elements; + r = abs->main_elements; else r = parent->children; + assert (abs->main_elements); for (; r; r = r->next) { data1_name *n; @@ -148,29 +157,54 @@ data1_element *data1_getelementbyname (data1_handle dh, data1_absyn *absyn, char *name) { data1_element *r; - - for (r = absyn->elements; r; r = r->next) + assert (absyn->main_elements); + for (r = absyn->main_elements; r; r = r->next) if (!data1_matchstr(r->name, name)) return r; 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]; + 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; - int level = 0; + int level; 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, "%s", file); + logf(LOG_WARN|LOG_ERRNO, "Couldn't open %s", file); return 0; } @@ -181,14 +215,14 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) res->attset = 0; 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; + + res->sub_elements = NULL; + res->main_elements = NULL; for (;;) { @@ -207,10 +241,22 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) { 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), + 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'", @@ -235,16 +281,24 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) return 0; } level = i; - new_element = cur[level] = *ppl[level] = + new_element = *ppl[level] = 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; - + + /* 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) { @@ -285,7 +339,6 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) fclose(f); return 0; } - /* parse termList definitions */ p = termlists; if (*p == '-') @@ -336,9 +389,27 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) 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) + { + logf(LOG_WARN, "Bad # of args to sub in %s: '%s'", + file, args); + continue; + } + cur_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; @@ -397,13 +468,13 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) { char name[512]; - if (!sscanf(args, "%s", name)) + if (!sscanf(args, "%511s", name)) { - logf(LOG_WARN, "%s malformed name directive in %s", file); + logf(LOG_WARN, "Malformed name directive in %s", file); fclose(f); return 0; } - res->name = nmem_strdup(data1_nmem_get(dh), args); + res->name = nmem_strdup(data1_nmem_get(dh), name); } else if (!strcmp(cmd, "reference")) { @@ -411,7 +482,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) if (!sscanf(args, "%s", name)) { - logf(LOG_WARN, "%s malformed reference directive in %s", file); + logf(LOG_WARN, "Malformed reference in %s", file); fclose(f); return 0; } @@ -428,7 +499,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) if (!sscanf(args, "%s", name)) { - logf(LOG_WARN, "%s malformed attset directive in %s", file); + logf(LOG_WARN, "Malformed attset directive in %s", file); fclose(f); return 0; } @@ -445,7 +516,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) if (!sscanf(args, "%s", name)) { - logf(LOG_WARN, "%s malformed tagset directive in %s", file); + logf(LOG_WARN, "Malformed tagset directive in %s", file); fclose(f); return 0; } @@ -462,7 +533,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) if (!sscanf(args, "%s", name)) { - logf(LOG_WARN, "%s malformed varset directive in %s", file); + logf(LOG_WARN, "Malformed varset directive in %s", file); fclose(f); return 0; } @@ -479,7 +550,8 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) if (sscanf(args, "%s %s", name, fname) != 2) { - logf(LOG_WARN, "%s: Two arg's required for esetname directive"); + logf(LOG_WARN, "Two arg's required for esetname in %s", + file); fclose(f); return 0; } @@ -502,13 +574,14 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) if (sscanf(args, "%s", name) != 1) { - logf(LOG_WARN, "%s: One argument required for maptab directive", - file); + logf(LOG_WARN, "One argument for maptab directive in %s", + file); continue; } if (!(*maptabp = data1_read_maptab (dh, name))) { - logf(LOG_WARN, "%s: Failed to read maptab."); + logf(LOG_WARN, "Failed to read maptab %s in %s", + name, file); continue; } maptabp = &(*maptabp)->next; @@ -519,13 +592,14 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) if (sscanf(args, "%s", name) != 1) { - logf(LOG_WARN, "%s: One argument required for marc directive", + logf(LOG_WARN, "One argument for marc directive in %s", file); continue; } if (!(*marcp = data1_read_marctab (dh, name))) { - logf(LOG_WARN, "%s: Failed to read marctab."); + logf(LOG_WARN, "%Failed to read marctab %s in %s", + name, file); continue; } marcp = &(*marcp)->next; @@ -538,6 +612,14 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) } } 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); + } logf (LOG_DEBUG, "end data1_read_absyn file=%s", file); return res; }