Fixed bug in match_triple. Thanks to Franck Falcoz <franck@dtv.dk>.

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

diff --git a/retrieval/d1_read.c b/retrieval/d1_read.c
index 2c83e93..e06f8f4 100644 (file)
--- a/retrieval/d1_read.c
+++ b/retrieval/d1_read.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: d1_read.c,v $
- * Revision 1.22  1998-03-05 08:15:32  adam
+ * Revision 1.25  1999-04-20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.24  1998/10/28 15:10:09  adam
+ * Added --with-yc option to configure. For the data1_node in data1.h:
+ * decreased size of localdata and removed member "line" which wasn't useful.
+ *
+ * Revision 1.23  1998/03/12 11:28:45  adam
+ * Fix: didn't set root member of tagged node in function.
+ * data1_add_insert_taggeddata.
+ *
+ * Revision 1.22  1998/03/05 08:15:32  adam
  * Implemented data1_add_insert_taggeddata utility which is more flexible
  * than data1_insert_taggeddata.
  *
@@ -197,7 +209,6 @@ data1_node *data1_add_insert_taggeddata(data1_handle dh, data1_node *root,
     data1_node *datn;
 
     tagn->which = DATA1N_tag;
-    tagn->line = -1;
     tagn->u.tag.tag = data1_insert_string (dh, tagn, m, tagname);
     tagn->u.tag.node_selected = 0;
     tagn->u.tag.make_variantlist = 0;
@@ -211,6 +222,7 @@ data1_node *data1_add_insert_taggeddata(data1_handle dh, data1_node *root,
     if (!local_allowed && !tagn->u.tag.element)
        return NULL;
     tagn->last_child = tagn->child = datn = data1_mk_node (dh, m);
+    tagn->root = root;
     datn->parent = tagn;
     datn->root = root;
     datn->which = DATA1N_data;
@@ -281,7 +293,7 @@ data1_node *data1_read_node (data1_handle dh, const char **buf,
     {
        char tag[64];
        char args[256];
-       int i;
+       size_t i;
        const char *t = (*buf) + 1;
        data1_node **pp;
        data1_element *elem = 0;