X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_absyn.c;h=006bb58e29f576bf1311f9abf482f6eb3cf4e7b5;hp=3262decf86a5893bcf091e38114689025bd3764e;hb=044d170f0a963555486df54653cd2fdc5815928b;hpb=52acac488c6f474a5260a2195b0b31ff68961924 diff --git a/retrieval/d1_absyn.c b/retrieval/d1_absyn.c index 3262dec..006bb58 100644 --- a/retrieval/d1_absyn.c +++ b/retrieval/d1_absyn.c @@ -4,7 +4,23 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_absyn.c,v $ - * Revision 1.13 1997-10-27 13:54:18 adam + * 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. + * + * 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. + * + * Revision 1.13 1997/10/27 13:54:18 adam * Changed structure field in data1 node to be simple string which * is "unknown" to the retrieval system itself. * @@ -87,7 +103,7 @@ 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); @@ -125,9 +141,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; @@ -143,46 +160,72 @@ 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; } - 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->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 (;;) { @@ -194,20 +237,29 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) break; } if (!r) - { - fclose(f); - return res; - } + break; if (sscanf(r, "%s %[^\n]", cmd, args) < 2) *args = '\0'; if (!strcmp(cmd, "elm")) { 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 = (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'", @@ -232,16 +284,24 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) return 0; } level = i; - new_element = cur[level] = *ppl[level] = - nmem_malloc(data1_nmem_get(dh), sizeof(*new_element)); + new_element = *ppl[level] = + (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; - + + /* 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) { @@ -264,11 +324,11 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) 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 = xstrdup(p); - nt->names = nmem_malloc(data1_nmem_get(dh), + 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; @@ -282,7 +342,6 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) fclose(f); return 0; } - /* parse termList definitions */ p = termlists; if (*p == '-') @@ -310,7 +369,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) } 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))) @@ -324,7 +383,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) (*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); } @@ -333,8 +392,26 @@ 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 = xstrdup(name); + 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 = (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")) { @@ -368,7 +445,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) 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))) { @@ -381,7 +458,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) (*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); } @@ -394,13 +471,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")) { @@ -408,7 +485,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; } @@ -425,7 +502,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; } @@ -442,7 +519,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; } @@ -459,7 +536,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; } @@ -476,16 +553,17 @@ 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; } - *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 == '@') (*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); @@ -499,13 +577,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; @@ -516,13 +595,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; @@ -534,4 +614,15 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) return 0; } } + 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; }