*** empty log message ***

[yaz-moved-to-github.git] / retrieval / d1_absyn.c

diff --git a/retrieval/d1_absyn.c b/retrieval/d1_absyn.c
index b38d7aa..47c3a51 100644 (file)
--- a/retrieval/d1_absyn.c
+++ b/retrieval/d1_absyn.c
@@ -1,10 +1,22 @@
 /*
- * 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.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.
  *
@@ -95,12 +107,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 +135,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;
 
@@ -121,7 +145,7 @@ data1_absyn *data1_get_absyn (data1_handle dh, char *name)
 }
 
 data1_esetname *data1_getesetbyname(data1_handle dh, data1_absyn *a,
-                                   char *name)
+                                   const char *name)
 {
     data1_esetname *r;
 
@@ -133,7 +157,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 +178,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);
@@ -208,7 +232,7 @@ data1_absyn *data1_read_absyn (data1_handle dh, const char *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 +271,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 +306,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 +345,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 +390,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 +404,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 +424,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 +466,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 +479,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);
                }
@@ -555,7 +579,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 == '@')