X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_absyn.c;h=1b4b44bf383c87e9c391425ffad2735841c835ab;hp=7cf36d5db2b701f0c20e145567ccfac25d078866;hb=4090fc5c7b77769020633d09cf63b325aceaf49a;hpb=7eb2f0de616840d9a340519eac4c271820cd1248 diff --git a/retrieval/d1_absyn.c b/retrieval/d1_absyn.c index 7cf36d5..1b4b44b 100644 --- a/retrieval/d1_absyn.c +++ b/retrieval/d1_absyn.c @@ -1,10 +1,26 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-1997, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_absyn.c,v $ - * Revision 1.11 1997-09-05 09:50:55 adam + * 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. + * + * 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 @@ -47,7 +63,6 @@ #include #include -#include #include #include #include @@ -55,39 +70,54 @@ #include #define D1_MAX_NESTING 128 -#define DATA1_MAX_SYNTAXES 30 /* max no of syntaxes to handle in one session */ -static struct /* cache of abstract syntaxes */ +struct data1_absyn_cache_info { char *name; data1_absyn *absyn; -} syntaxes[DATA1_MAX_SYNTAXES] = {{0,0}}; + data1_absyn_cache next; +}; -data1_absyn *data1_get_absyn(char *name) +data1_absyn *data1_absyn_search (data1_handle dh, const char *name) { - char fname[512]; - int i; - - for (i = 0; syntaxes[i].name; i++) - if (!strcmp(name, syntaxes[i].name)) - return syntaxes[i].absyn; + data1_absyn_cache p = *data1_absyn_cache_get (dh); - if (i >= DATA1_MAX_SYNTAXES - 1) + while (p) { - logf(LOG_WARN, "Too many abstract syntaxes loaded"); - return 0; + if (!strcmp (name, p->name)) + return p->absyn; + p = p->next; } + return NULL; +} + +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 *pp = data1_absyn_cache_get (dh); + sprintf(fname, "%s.abs", name); - if (!(syntaxes[i].absyn = data1_read_absyn(fname))) - return 0; - if (!(syntaxes[i].name = xmalloc(strlen(name)+1))) - abort(); - strcpy(syntaxes[i].name, name); - syntaxes[i+1].name = 0; - return syntaxes[i].absyn; + p->absyn = data1_read_absyn (dh, fname); + p->name = nmem_strdup (mem, name); + p->next = *pp; + *pp = p; + return p->absyn; } -data1_esetname *data1_getesetbyname(data1_absyn *a, char *name) +data1_absyn *data1_get_absyn (data1_handle dh, char *name) +{ + data1_absyn *absyn; + + if (!(absyn = data1_absyn_search (dh, name))) + absyn = data1_absyn_add (dh, name); + return absyn; +} + +data1_esetname *data1_getesetbyname(data1_handle dh, data1_absyn *a, + char *name) { data1_esetname *r; @@ -97,15 +127,17 @@ data1_esetname *data1_getesetbyname(data1_absyn *a, char *name) return 0; } -data1_element *data1_getelementbytagname(data1_absyn *abs, - data1_element *parent, char *tagname) +data1_element *data1_getelementbytagname (data1_handle dh, data1_absyn *abs, + data1_element *parent, + char *tagname) { 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; @@ -117,50 +149,52 @@ data1_element *data1_getelementbytagname(data1_absyn *abs, return 0; } -data1_element *data1_getelementbyname(data1_absyn *absyn, char *name) +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; } -data1_absyn *data1_read_absyn(char *file) +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; - if (!(f = yaz_path_fopen(data1_get_tabpath(), file, "r"))) + 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; } - if (!(res = xmalloc(sizeof(*res)))) - abort(); + res = 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 (;;) { @@ -172,10 +206,7 @@ data1_absyn *data1_read_absyn(char *file) break; } if (!r) - { - fclose(f); - return res; - } + break; if (sscanf(r, "%s %[^\n]", cmd, args) < 2) *args = '\0'; if (!strcmp(cmd, "elm")) @@ -186,6 +217,18 @@ data1_absyn *data1_read_absyn(char *file) 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'", @@ -210,16 +253,29 @@ data1_absyn *data1_read_absyn(char *file) return 0; } level = i; - if (!(new_element = cur[level] = *ppl[level] = xmalloc(sizeof(*new_element)))) - abort; + 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)); new_element->next = new_element->children = 0; new_element->tag = 0; new_element->termlists = 0; - new_element->parent = level ? cur[level - 1] : 0; + tp = &new_element->termlists; ppl[level] = &new_element->next; ppl[level+1] = &new_element->children; - + /* well-defined tag */ if (sscanf(p, "(%d,%d)", &type, &value) == 2) { @@ -229,7 +285,8 @@ data1_absyn *data1_read_absyn(char *file) fclose(f); return 0; } - if (!(new_element->tag = data1_gettagbynum(res->tagset, type, value))) + 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); @@ -240,10 +297,13 @@ data1_absyn *data1_read_absyn(char *file) /* private tag */ else if (*p) { - data1_tag *nt = new_element->tag = xmalloc(sizeof(*new_element->tag)); + data1_tag *nt = + new_element->tag = nmem_malloc(data1_nmem_get (dh), + sizeof(*new_element->tag)); nt->which = DATA1T_string; - nt->value.string = xstrdup(p); - nt->names = xmalloc(sizeof(*new_element->tag->names)); + nt->value.string = nmem_strdup(data1_nmem_get (dh), p); + nt->names = 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; @@ -284,30 +344,50 @@ data1_absyn *data1_read_absyn(char *file) } if (*attname == '!') strcpy(attname, name); - *tp = xmalloc(sizeof(**tp)); - if (!((*tp)->att = data1_getattbyname(res->attset, - attname))) + *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); + 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)->structure = "w"; + else + { + (*tp)->structure = 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 = 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 = 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")) { @@ -341,22 +421,23 @@ data1_absyn *data1_read_absyn(char *file) fclose(f); return 0; } - *tp = xmalloc(sizeof(**tp)); - if (!((*tp)->att = data1_getattbyname(res->attset, - attname))) + *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); + 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)->structure = "w"; + else + { + (*tp)->structure = nmem_malloc (data1_nmem_get (dh), + strlen(structure)+1); + strcpy ((*tp)->structure, structure); + } (*tp)->next = 0; tp = &(*tp)->next; } @@ -366,15 +447,13 @@ data1_absyn *data1_read_absyn(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; } - if (!(res->name = xmalloc(strlen(args)+1))) - abort(); - strcpy(res->name, name); + res->name = nmem_strdup(data1_nmem_get(dh), name); } else if (!strcmp(cmd, "reference")) { @@ -382,7 +461,7 @@ data1_absyn *data1_read_absyn(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; } @@ -399,11 +478,11 @@ data1_absyn *data1_read_absyn(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; } - if (!(res->attset = data1_read_attset(name))) + if (!(res->attset = data1_read_attset (dh, name))) { logf(LOG_WARN, "Attset failed in %s", file); fclose(f); @@ -416,11 +495,11 @@ data1_absyn *data1_read_absyn(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; } - if (!(res->tagset = data1_read_tagset(name))) + if (!(res->tagset = data1_read_tagset (dh, name))) { logf(LOG_WARN, "Tagset failed in %s", file); fclose(f); @@ -433,11 +512,11 @@ data1_absyn *data1_read_absyn(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; } - if (!(res->varset = data1_read_varset(name))) + if (!(res->varset = data1_read_varset (dh, name))) { logf(LOG_WARN, "Varset failed in %s", file); fclose(f); @@ -450,22 +529,22 @@ data1_absyn *data1_read_absyn(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 = xmalloc(sizeof(**esetpp)); - (*esetpp)->name = xmalloc(strlen(name)+1); - strcpy((*esetpp)->name, name); + *esetpp = 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(fname, 0))) + else if (!((*esetpp)->spec = data1_read_espec1 (dh, fname))) { logf(LOG_WARN, "%s: Espec-1 read failed", file); fclose(f); return 0; } - (*esetpp)->next = 0; esetpp = &(*esetpp)->next; } else if (!strcmp(cmd, "maptab")) @@ -474,13 +553,14 @@ data1_absyn *data1_read_absyn(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(name))) + 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; @@ -491,13 +571,14 @@ data1_absyn *data1_read_absyn(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(name))) + 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; @@ -509,4 +590,14 @@ data1_absyn *data1_read_absyn(char *file) return 0; } } + 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; + + logf (LOG_DEBUG, "end data1_read_absyn file=%s", file); + return res; }