X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_absyn.c;h=7813015cbbdb97cac10acebe7e8117beceb1d973;hp=b38d7aa8b5c7612ef07a49e4ab95632c72504aa3;hb=ec29e37cd269b330eb493157dedf9aacf5c6ca46;hpb=f7d86f5de3de80dcd56b7f5206d46203095eaf36 diff --git a/retrieval/d1_absyn.c b/retrieval/d1_absyn.c index b38d7aa..7813015 100644 --- a/retrieval/d1_absyn.c +++ b/retrieval/d1_absyn.c @@ -1,10 +1,30 @@ /* - * 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.16 1997-12-18 10:51:30 adam + * Revision 1.21 1998-06-09 13:55:07 adam + * Minor changes. + * + * Revision 1.20 1998/05/18 13:07:02 adam + * Changed the way attribute sets are handled by the retriaval module. + * Extended Explain conversion / schema. + * Modified server and client to work with ASN.1 compiled protocol handlers. + * + * 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. * @@ -82,6 +102,13 @@ struct data1_absyn_cache_info 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); @@ -95,12 +122,24 @@ data1_absyn *data1_absyn_search (data1_handle dh, const char *name) 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); @@ -111,7 +150,7 @@ data1_absyn *data1_absyn_add (data1_handle dh, const char *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; @@ -120,8 +159,75 @@ data1_absyn *data1_get_absyn (data1_handle dh, char *name) 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) + logf (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; @@ -133,7 +239,7 @@ data1_esetname *data1_getesetbyname(data1_handle dh, data1_absyn *a, data1_element *data1_getelementbytagname (data1_handle dh, data1_absyn *abs, data1_element *parent, - char *tagname) + const char *tagname) { data1_element *r; @@ -154,7 +260,7 @@ data1_element *data1_getelementbytagname (data1_handle dh, data1_absyn *abs, } data1_element *data1_getelementbyname (data1_handle dh, data1_absyn *absyn, - char *name) + const char *name) { data1_element *r; assert (absyn->main_elements); @@ -199,16 +305,15 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) data1_maptab **maptabp; data1_marctab **marcp; data1_termlist *all = 0; - int level; + int level = 0; - 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, "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; @@ -247,7 +352,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) 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; @@ -282,7 +387,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) } level = i; 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; @@ -321,11 +426,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 = 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; @@ -366,7 +471,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))) @@ -380,7 +485,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); } @@ -400,7 +505,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) 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; @@ -442,7 +547,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))) { @@ -455,7 +560,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); } @@ -503,7 +608,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *file) fclose(f); return 0; } - if (!(res->attset = data1_read_attset (dh, name))) + if (!(res->attset = data1_get_attset (dh, name))) { logf(LOG_WARN, "Attset failed in %s", file); fclose(f); @@ -555,7 +660,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *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 == '@')