X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=data1%2Fd1_read.c;h=1c50d0607d6bb0e4bebef1ca535a60abcc3a681d;hb=c23dcf8e79596d2ae1fc05596e1d60ed318962e7;hp=706907b42252824a6f71d9637eb240820b64d21b;hpb=b8e7314298fa5e61a64deb55ec51a619fd6b4869;p=idzebra-moved-to-github.git

diff --git a/data1/d1_read.c b/data1/d1_read.c
index 706907b..1c50d06 100644
--- a/data1/d1_read.c
+++ b/data1/d1_read.c
@@ -1,4 +1,4 @@
-/* $Id: d1_read.c,v 1.16 2005-04-23 16:30:58 adam Exp $
+/* $Id: d1_read.c,v 1.20 2006-07-06 11:40:23 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -125,7 +125,6 @@ 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)
@@ -154,7 +153,6 @@ data1_node *data1_insert_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;
     
     if (!parent)
         r->root = r;
@@ -172,23 +170,9 @@ data1_node *data1_insert_node (data1_handle dh, NMEM m, int type,
     return r;
 }
 
-void data1_free_tree (data1_handle dh, data1_node *t)
-{
-    data1_node *p = t->child, *pn;
-
-    while (p)
-    {
-	pn = p->next;
-	data1_free_tree (dh, p);
-	p = pn;
-    }
-    if (t->destroy)
-	(*t->destroy)(t);
-}
-
 data1_node *data1_mk_root (data1_handle dh, NMEM nmem, const char *name)
 {
-    data1_absyn *absyn = data1_get_absyn (dh, name);
+    data1_absyn *absyn = data1_get_absyn(dh, name, 1);
     data1_node *res;
     if (!absyn)
     {
@@ -205,7 +189,8 @@ data1_node *data1_mk_root (data1_handle dh, NMEM nmem, const char *name)
 void data1_set_root(data1_handle dh, data1_node *res,
                     NMEM nmem, const char *name)
 {
-    data1_absyn *absyn = data1_get_absyn (dh, name);
+    data1_absyn *absyn = data1_get_absyn(
+        dh, name, DATA1_XPATH_INDEXING_ENABLE);
 
     res->u.root.type = data1_insert_string (dh, res, nmem, name);
     res->u.root.absyn = absyn;
@@ -865,7 +850,6 @@ data1_node *data1_read_nodex (data1_handle dh, NMEM m,
 		const char *type = xattr->next->name;
 		const char *value = xattr->next->name;
 		data1_vartype *tp;
-		int val_offset;
 		
 		yaz_log(YLOG_LOG, "Variant class=%s type=%s value=%s",
 			tclass, type, value);
@@ -1179,3 +1163,11 @@ void data1_concat_text(data1_handle dh, NMEM m, data1_node *n)
         data1_concat_text(dh, m, n->child);
     }
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+