X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fdata1.h;h=d09d5b0ba2ec2255af89192c0d5e09224f38a3e0;hb=cdea632bd515af06beaa311c8569180da1e082da;hp=e7982d4a99236fb011ce70b163e24f9b7b4503d1;hpb=21a7fea425de8b32ac71bbbb981e88e77e6a3428;p=yaz-moved-to-github.git

diff --git a/include/data1.h b/include/data1.h
index e7982d4..d09d5b0 100644
--- a/include/data1.h
+++ b/include/data1.h
@@ -24,7 +24,18 @@
  * OF THIS SOFTWARE.
  *
  * $Log: data1.h,v $
- * Revision 1.38  1998-10-15 08:29:15  adam
+ * Revision 1.41  1999-07-13 13:23:47  adam
+ * Non-recursive version of data1_read_node. data1_read_nodex reads
+ * stream of bytes (instead of buffer in memory).
+ *
+ * Revision 1.40  1998/11/03 10:14:12  adam
+ * Changed definition of data1 node so that it uses less space.
+ *
+ * Revision 1.39  1998/10/28 15:10:06  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.38  1998/10/15 08:29:15  adam
  * Tag set type may be specified in reference to it using "tagset"
  * directive in .abs-files and "include" directive in .tag-files.
  *
@@ -406,14 +417,16 @@ typedef struct data1_node
 	{
 	    char *tag;
 	    data1_element *element;
-	    int node_selected;
-	    int make_variantlist;
 	    int no_data_requested;
 	    int get_bytes;
+	    unsigned node_selected : 1;
+	    unsigned make_variantlist : 1;
 	} tag;
 
 	struct
 	{
+	    char *data;      /* filename or data */
+	    int len;
         /* text inclusion */
 #define DATA1I_inctxt 1
         /* binary data inclusion */
@@ -424,10 +437,8 @@ typedef struct data1_node
 #define DATA1I_num 4
         /* object identifier */
 #define DATA1I_oid 5         
-            int what;
-	    int formatted_text;     /* newlines are significant */
-	    int len;
-	    char *data;      /* filename or data */
+            unsigned what:7;
+	    unsigned formatted_text : 1;   /* newlines are significant */
 	} data;
 
 	struct
@@ -438,9 +449,8 @@ typedef struct data1_node
     } u;
 
     void (*destroy)(struct data1_node *n);
-#define DATA1_LOCALDATA 40
+#define DATA1_LOCALDATA 12
     char lbuf[DATA1_LOCALDATA]; /* small buffer for local data */
-    int line;
     struct data1_node *next;
     struct data1_node *child;
     struct data1_node *last_child;
@@ -452,8 +462,10 @@ YAZ_EXPORT data1_handle data1_create (void);
 YAZ_EXPORT void data1_destroy(data1_handle dh);
 YAZ_EXPORT data1_node *get_parent_tag(data1_handle dh, data1_node *n);
 YAZ_EXPORT data1_node *data1_read_node(data1_handle dh, const char **buf,
-				       data1_node *parent,
-				       int *line, data1_absyn *absyn, NMEM m);
+				       NMEM m);
+YAZ_EXPORT data1_node *data1_read_nodex (data1_handle dh, NMEM m,
+					 int (*get_byte)(void *fh), void *fh,
+					 WRBUF wrbuf);
 YAZ_EXPORT data1_node *data1_read_record(data1_handle dh, 
 					 int (*rf)(void *, char *, size_t),
 					 void *fh, NMEM m);