using yaz/log.h again

[idzebra-moved-to-github.git] / data1 / d1_read.c

diff --git a/data1/d1_read.c b/data1/d1_read.c
index 6e179d9..f169487 100644 (file)
--- a/data1/d1_read.c
+++ b/data1/d1_read.c
@@ -1,5 +1,5 @@
-/* $Id: d1_read.c,v 1.5 2003-09-08 10:26:51 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+/* $Id: d1_read.c,v 1.13 2004-12-13 20:51:28 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -29,10 +29,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <yaz/xmalloc.h>
 #include <yaz/yaz-util.h>
-#include <yaz/log.h>
-#include <data1.h>
+#include <d1_absyn.h>
 
 data1_node *data1_get_root_tag (data1_handle dh, data1_node *n)
 {
@@ -118,7 +116,7 @@ static void data1_init_node (data1_handle dh, data1_node *r, int type)
         r->u.preprocess.attributes = 0;
         break;
     default:
-       logf (LOG_WARN, "data_mk_node_type. bad type = %d\n", type);
+       yaz_log (YLOG_WARN, "data_mk_node_type. bad type = %d\n", type);
     }
 }
 
@@ -128,13 +126,13 @@ data1_node *data1_append_node (data1_handle dh, NMEM m, int type,
     data1_node *r = (data1_node *)nmem_malloc(m, sizeof(*r));
     r->next = r->child = r->last_child = 0;
     r->destroy = 0;
-    
+
+    r->parent = parent;
     if (!parent)
         r->root = r;
     else
     {
         r->root = parent->root;
-        r->parent = parent;
         if (!parent->child)
             parent->child = parent->last_child = r;
         else
@@ -194,7 +192,7 @@ data1_node *data1_mk_root (data1_handle dh, NMEM nmem, const char *name)
     data1_node *res;
     if (!absyn)
     {
-        yaz_log(LOG_WARN, "Unable to acquire abstract syntax " "for '%s'",
+        yaz_log(YLOG_WARN, "Unable to acquire abstract syntax " "for '%s'",
                 name); 
         /* It's now OK for a record not to have an absyn */
     }
@@ -213,6 +211,24 @@ void data1_set_root(data1_handle dh, data1_node *res,
     res->u.root.absyn = absyn;
 }
 
+void data1_add_attrs(data1_handle dh, NMEM nmem, const char **attr,
+                    data1_xattr **p)
+{
+    while (*p)
+        p = &(*p)->next;
+
+    while (attr && *attr)
+    {
+        *p = (data1_xattr*) nmem_malloc (nmem, sizeof(**p));
+        (*p)->name = nmem_strdup (nmem, *attr++);
+        (*p)->value = nmem_strdup (nmem, *attr++);
+        (*p)->what = DATA1I_text;
+
+        p = &(*p)->next;
+    }
+    *p = 0;
+}
+                    
 data1_node *data1_mk_preprocess (data1_handle dh, NMEM nmem,
                                  const char *target,
                                  const char **attr, data1_node *at)
@@ -225,22 +241,31 @@ data1_node *data1_mk_preprocess_n (data1_handle dh, NMEM nmem,
                                    const char *target, size_t len,
                                    const char **attr, data1_node *at)
 {
-    data1_xattr **p;
     data1_node *res = data1_mk_node2 (dh, nmem, DATA1N_preprocess, at);
     res->u.preprocess.target = data1_insert_string_n (dh, res, nmem,
                                                       target, len);
     
-    p = &res->u.preprocess.attributes;
-    while (attr && *attr)
-    {
-        *p = (data1_xattr*) nmem_malloc (nmem, sizeof(**p));
-        (*p)->name = nmem_strdup (nmem, *attr++);
-        (*p)->value = nmem_strdup (nmem, *attr++);
-        (*p)->what = DATA1I_text;
+    data1_add_attrs(dh, nmem, attr, &res->u.preprocess.attributes);
+    return res;
+}
 
-        p = &(*p)->next;
-    }
-    *p = 0;
+data1_node *data1_insert_preprocess (data1_handle dh, NMEM nmem,
+                                 const char *target,
+                                 const char **attr, data1_node *at)
+{
+    return data1_insert_preprocess_n (dh, nmem, target, strlen(target),
+                                     attr, at);
+}
+
+data1_node *data1_insert_preprocess_n (data1_handle dh, NMEM nmem,
+                                   const char *target, size_t len,
+                                   const char **attr, data1_node *at)
+{
+    data1_node *res = data1_insert_node (dh, nmem, DATA1N_preprocess, at);
+    res->u.preprocess.target = data1_insert_string_n (dh, res, nmem,
+                                                      target, len);
+    
+    data1_add_attrs(dh, nmem, attr, &res->u.preprocess.attributes);
     return res;
 }
 
@@ -250,7 +275,6 @@ data1_node *data1_mk_tag_n (data1_handle dh, NMEM nmem,
 {
     data1_node *partag = get_parent_tag(dh, at);
     data1_node *res = data1_mk_node2 (dh, nmem, DATA1N_tag, at);
-    data1_xattr **p;
     data1_element *e = 0;
     
     res->u.tag.tag = data1_insert_string_n (dh, res, nmem, tag, len);
@@ -268,40 +292,17 @@ data1_node *data1_mk_tag_n (data1_handle dh, NMEM nmem,
                                            e, res->u.tag.tag);
     }
     res->u.tag.element = e;
-    p = &res->u.tag.attributes;
-    while (attr && *attr)
-    {
-        *p = (data1_xattr*) nmem_malloc (nmem, sizeof(**p));
-        (*p)->name = nmem_strdup (nmem, *attr++);
-        (*p)->value = nmem_strdup (nmem, *attr++);
-        (*p)->what = DATA1I_text;
-        p = &(*p)->next;
-    }
-    *p = 0;
+    data1_add_attrs(dh, nmem, attr, &res->u.tag.attributes);
     return res;
 }
 
 void data1_tag_add_attr (data1_handle dh, NMEM nmem,
                          data1_node *res, const char **attr)
 {
-    data1_xattr **p;
-
     if (res->which != DATA1N_tag)
         return;
 
-    p = &res->u.tag.attributes;
-    while (*p)
-        p = &(*p)->next;
-
-    while (attr && *attr)
-    {
-        *p = (data1_xattr*) nmem_malloc (nmem, sizeof(**p));
-        (*p)->name = nmem_strdup (nmem, *attr++);
-        (*p)->value = nmem_strdup (nmem, *attr++);
-        (*p)->what = DATA1I_text;
-        p = &(*p)->next;
-    }
-    *p = 0;
+    data1_add_attrs(dh, nmem, attr, &res->u.tag.attributes);
 }
 
 data1_node *data1_mk_tag (data1_handle dh, NMEM nmem,
@@ -467,8 +468,8 @@ data1_node *data1_add_taggeddata (data1_handle dh, data1_node *root,
     return data1_add_insert_taggeddata (dh, at, tagname, m, 1, 0);
 }
 
-data1_node *data1_mk_tag_data_int (data1_handle dh, data1_node *at,
-                                   const char *tag, int num,
+data1_node *data1_mk_tag_data_zint (data1_handle dh, data1_node *at,
+                                   const char *tag, zint num,
                                    NMEM nmem)
 {
     data1_node *node_data;
@@ -478,11 +479,18 @@ data1_node *data1_mk_tag_data_int (data1_handle dh, data1_node *at,
        return 0;
     node_data->u.data.what = DATA1I_num;
     node_data->u.data.data = node_data->lbuf;
-    sprintf (node_data->u.data.data, "%d", num);
+    sprintf (node_data->u.data.data, ZINT_FORMAT, num);
     node_data->u.data.len = strlen (node_data->u.data.data);
     return node_data;
 }
 
+data1_node *data1_mk_tag_data_int (data1_handle dh, data1_node *at,
+                                   const char *tag, int num,
+                                   NMEM nmem)
+{
+    return data1_mk_tag_data_zint(dh, at, tag, num, nmem);
+}
+
 data1_node *data1_mk_tag_data_oid (data1_handle dh, data1_node *at,
                                    const char *tag, Odr_oid *oid,
                                    NMEM nmem)
@@ -776,7 +784,7 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
            }
            if (amp || c != '>')
            {
-               yaz_log(LOG_WARN, "d1: %d: Malformed tag", line);
+               yaz_log(YLOG_WARN, "d1: %d: Malformed tag", line);
                return 0;
            }
            else
@@ -804,7 +812,7 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
                    }
                    if (i != level)
                    {
-                       yaz_log (LOG_WARN, "%d: no begin tag for %s",
+                       yaz_log (YLOG_WARN, "%d: no begin tag for %s",
                                 line, tag);
                        break;
                    }
@@ -829,7 +837,7 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
                
                if (sscanf(args, "%s %s %n", tclass, type, &val_offset) != 2)
                {
-                   yaz_log(LOG_WARN, "Malformed variant triple at '%s'", tag);
+                   yaz_log(YLOG_WARN, "Malformed variant triple at '%s'", tag);
                    continue;
                }
                if (!(tp =