Added OID type.

[yaz-moved-to-github.git] / include / data1.h

diff --git a/include/data1.h b/include/data1.h
index 14de485..25479fa 100644 (file)
--- a/include/data1.h
+++ b/include/data1.h
@@ -24,7 +24,16 @@
  * OF THIS SOFTWARE.
  *
  * $Log: data1.h,v $
- * Revision 1.12  1996-01-18 09:46:34  adam
+ * Revision 1.15  1996-06-03 09:46:03  quinn
+ * Added OID type.
+ *
+ * Revision 1.14  1996/05/09  07:27:11  quinn
+ * Multiple local values supported.
+ *
+ * Revision 1.13  1996/02/20  16:32:48  quinn
+ * Created util file.
+ *
+ * Revision 1.12  1996/01/18  09:46:34  adam
  * Changed prototype for reader function parsed to data1_read_record.
  *
  * Revision 1.11  1995/12/15  16:19:45  quinn
@@ -114,6 +123,8 @@
 #include <d1_attset.h>
 #include <d1_map.h>
 
+#define data1_matchstr(s1, s2) yaz_matchstr(s1, s2)
+
 extern char *data1_tabpath; /* global path for tables */
 
 #define DATA1_MAX_SYMBOL 31
@@ -138,6 +149,12 @@ typedef enum data1_datatype
     DATA1K_null
 } data1_datatype;
 
+typedef enum data1_structure
+{
+    DATA1S_word,
+    DATA1S_phrase
+} data1_structure;
+
 typedef struct data1_marctab
 {
     char *name;
@@ -228,6 +245,13 @@ typedef struct data1_tagset
     struct data1_tagset *next;       /* sibling */
 } data1_tagset;
 
+typedef struct data1_termlist
+{
+    data1_att *att;
+    data1_structure structure;
+    struct data1_termlist *next;
+} data1_termlist;
+
 /*
  * abstract syntax specification
  */
@@ -236,7 +260,7 @@ typedef struct data1_element
 {
     char *name;
     data1_tag *tag;
-    data1_att *att;
+    data1_termlist *termlists;
     struct data1_element *children;
     struct data1_element *next;
 } data1_element;
@@ -293,7 +317,8 @@ typedef struct data1_node
                DATA1I_inctxt,      /* text inclusion */
                DATA1I_incbin,      /* binary data inclusion */
                DATA1I_text,        /* text data */
-               DATA1I_num          /* numerical data */
+               DATA1I_num,         /* numerical data */
+               DATA1I_oid          /* object identifier */
            } what;
            int formatted_text;     /* newlines are significant */
            int len;