X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fdata1.h;h=4178b55dbb29df22fafb2e8093bc4bbdd632e14b;hb=7851330f91232de8147b1b9653d3e3d7069b5c06;hp=f6e6448a9234706de835471e26ff8517c4c20b73;hpb=068a5a7412f492019b4d6f5e89158098d44368f7;p=yaz-moved-to-github.git

diff --git a/include/data1.h b/include/data1.h
index f6e6448..4178b55 100644
--- a/include/data1.h
+++ b/include/data1.h
@@ -24,7 +24,19 @@
  * OF THIS SOFTWARE.
  *
  * $Log: data1.h,v $
- * Revision 1.30  1997-10-31 12:20:07  adam
+ * Revision 1.33  1997-12-18 10:51:30  adam
+ * Implemented sub-trees feature for schemas - including forward
+ * references.
+ *
+ * Revision 1.32  1997/12/09 16:18:16  adam
+ * Work on EXPLAIN schema. First implementation of sub-schema facility
+ * in the *.abs files.
+ *
+ * Revision 1.31  1997/11/18 09:51:08  adam
+ * Removed element num_children from data1_node. Minor changes in
+ * data1 to Explain.
+ *
+ * Revision 1.30  1997/10/31 12:20:07  adam
  * Improved memory debugging for xmalloc/nmem.c. References to NMEM
  * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
  * Bug fix: missing fclose in data1_read_espec1.
@@ -310,11 +322,17 @@ typedef struct data1_element
     char *name;
     data1_tag *tag;
     data1_termlist *termlists;
-    struct data1_element *parent;
+    char *sub_name;
     struct data1_element *children;
     struct data1_element *next;
 } data1_element;
 
+typedef struct data1_sub_elements {
+    char *name;
+    struct data1_sub_elements *next;
+    data1_element *elements;
+} data1_sub_elements;
+
 typedef struct data1_absyn
 {
     char *name;
@@ -325,7 +343,8 @@ typedef struct data1_absyn
     data1_esetname *esetnames;
     data1_maptab *maptabs;
     data1_marctab *marc;
-    data1_element *elements;
+    data1_sub_elements *sub_elements;
+    data1_element *main_elements;
 } data1_absyn;
 
 /*
@@ -385,18 +404,12 @@ typedef struct data1_node
 	    data1_vartype *type;
 	    char *value;
 	} variant;
-
-	struct
-	{
-	    char *ind;
-	} indicator;
     } u;
 
     void (*destroy)(struct data1_node *n);
 #define DATA1_LOCALDATA 40
     char lbuf[DATA1_LOCALDATA]; /* small buffer for local data */
     int line;
-    int num_children;
     struct data1_node *next;
     struct data1_node *child;
     struct data1_node *last_child;