X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_read.c;h=e4b8d2356a79992656108bf132c730cd4e3d9a65;hb=180d06f2b91d0197c8ac7548f0e90f91b8427068;hp=2e989bf57657b5a649405015e7c39c9ded09bd13;hpb=d296bf4d8d017e615b5030f422b99053c4e382e0;p=yaz-moved-to-github.git

diff --git a/retrieval/d1_read.c b/retrieval/d1_read.c
index 2e989bf..e4b8d23 100644
--- 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.7  1995-12-13 13:44:32  quinn
+ * Revision 1.11  1996-07-06 19:58:35  quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.10  1996/01/19  15:41:47  quinn
+ * Fixed uninitialized boolean.
+ *
+ * Revision 1.9  1996/01/17  14:52:47  adam
+ * Changed prototype for reader function parsed to data1_read_record.
+ *
+ * Revision 1.8  1995/12/15  16:20:41  quinn
+ * Added formatted text.
+ *
+ * Revision 1.7  1995/12/13  13:44:32  quinn
  * Modified Data1-system to use nmem
  *
  * Revision 1.6  1995/12/12  16:37:08  quinn
@@ -161,6 +173,7 @@ data1_node *data1_insert_taggeddata(data1_node *root, data1_node *at,
     tagn->u.tag.node_selected = 0;
     tagn->u.tag.make_variantlist = 0;
     tagn->u.tag.no_data_requested = 0;
+    tagn->u.tag.get_bytes = -1;
     if (!(tagn->u.tag.element = data1_getelementbytagname(root->u.root.absyn,
 	0, tagname)))
 	return 0;
@@ -169,6 +182,7 @@ data1_node *data1_insert_taggeddata(data1_node *root, data1_node *at,
     datn->parent = tagn;
     datn->root = root;
     datn->which = DATA1N_data;
+    datn->u.data.formatted_text = 0;
     tagn->next = at->child;
     tagn->parent = at;
     at->child = tagn;
@@ -350,6 +364,7 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
 	    res->u.tag.node_selected = 0;
 	    res->u.tag.make_variantlist = 0;
 	    res->u.tag.no_data_requested = 0;
+	    res->u.tag.get_bytes = -1;
 	    res->root = parent->root;
 	    *buf = t + 1;
 	}
@@ -400,6 +415,7 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
 	res->u.data.what = DATA1I_text;
 	res->u.data.len = len;
 	res->u.data.data = data;
+	res->u.data.formatted_text = 0;
 	res->root = parent->root;
     }
     return res;
@@ -408,7 +424,8 @@ data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
 /*
  * Read a record in the native syntax.
  */
-data1_node *data1_read_record(int (*rf)(int, char *, size_t), int fd, NMEM m)
+data1_node *data1_read_record(int (*rf)(void *, char *, size_t), void *fh,
+                              NMEM m)
 {
     static char *buf = 0;
     char *bp;
@@ -423,7 +440,7 @@ data1_node *data1_read_record(int (*rf)(int, char *, size_t), int fd, NMEM m)
     {
 	if (rd + 4096 > size && !(buf =xrealloc(buf, size *= 2)))
 	    abort();
-	if ((res = (*rf)(fd, buf + rd, 4096)) <= 0)
+	if ((res = (*rf)(fh, buf + rd, 4096)) <= 0)
 	{
 	    if (!res)
 	    {