X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fdata1.h;h=7c8c961faac3f1ea9502c10caca7bd9f85f1d107;hb=9a2b41f58cf220c9583b654ff77776a18e958b44;hp=f1b2982bc220d43e3348cc87465ec6c498c6da19;hpb=d296bf4d8d017e615b5030f422b99053c4e382e0;p=yaz-moved-to-github.git

diff --git a/include/data1.h b/include/data1.h
index f1b2982..7c8c961 100644
--- a/include/data1.h
+++ b/include/data1.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1996, Index Data.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -24,7 +24,56 @@
  * OF THIS SOFTWARE.
  *
  * $Log: data1.h,v $
- * Revision 1.8  1995-12-13 13:44:23  quinn
+ * Revision 1.24  1997-09-01 09:30:39  adam
+ * Added include of yaz-util.h.
+ *
+ * Revision 1.23  1997/09/01 08:58:04  adam
+ * Removed declaration of data1_matchstr since it's a macro.
+ *
+ * Revision 1.22  1997/09/01 08:49:48  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.21  1997/05/14 06:53:38  adam
+ * C++ support.
+ *
+ * Revision 1.20  1996/10/29 13:34:39  adam
+ * New functions to get/set data1_tabpath.
+ *
+ * Revision 1.19  1996/10/11 11:57:16  quinn
+ * Smallish
+ *
+ * Revision 1.18  1996/10/07  15:29:16  quinn
+ * Added SOIF support
+ *
+ * Revision 1.17  1996/07/06  19:58:32  quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.16  1996/06/10  08:55:34  quinn
+ * Added Summary. Unfinished work
+ *
+ * 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
+ * Added formatted_text.
+ *
+ * Revision 1.10  1995/12/14  11:09:43  quinn
+ * Work on Explain
+ *
+ * Revision 1.9  1995/12/13  15:32:47  quinn
+ * Added sgml-output.
+ *
+ * Revision 1.8  1995/12/13  13:44:23  quinn
  * Modified Data1-system to use nmem
  *
  * Revision 1.7  1995/12/12  16:37:05  quinn
@@ -101,6 +150,13 @@
 
 #include <d1_attset.h>
 #include <d1_map.h>
+#include <yaz-util.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define data1_matchstr(s1, s2) yaz_matchstr(s1, s2)
 
 extern char *data1_tabpath; /* global path for tables */
 
@@ -126,6 +182,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;
@@ -159,7 +221,7 @@ typedef struct data1_esetname
 typedef struct data1_vartype
 {
     char *name;
-    struct data1_varclass *class;
+    struct data1_varclass *zclass;
     int type;
     data1_datatype datatype;
     struct data1_vartype *next;
@@ -169,7 +231,7 @@ typedef struct data1_varclass
 {
     char *name;
     struct data1_varset *set;
-    int class;
+    int zclass;
     data1_vartype *types;
     struct data1_varclass *next;
 } data1_varclass;
@@ -190,11 +252,9 @@ struct data1_tagset;
 typedef struct data1_tag
 {
     data1_name *names;
-    enum
-    {
-	DATA1T_numeric,
-	DATA1T_string
-    } which;
+#define DATA1T_numeric 1
+#define DATA1T_string 2
+    int which;
     union
     {
 	int numeric;
@@ -216,6 +276,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
  */
@@ -224,7 +291,8 @@ typedef struct data1_element
 {
     char *name;
     data1_tag *tag;
-    data1_att *att;
+    data1_termlist *termlists;
+    struct data1_element *parent;
     struct data1_element *children;
     struct data1_element *next;
 } data1_element;
@@ -248,14 +316,17 @@ typedef struct data1_absyn
 
 typedef struct data1_node
 {
-    enum 
-    {
-	DATA1N_root,        /* the root of a record (containing global data) */
-	DATA1N_tag,         /* a tag */
-	DATA1N_data,        /* some data under a leaf tag or variant */
-	DATA1N_variant,     /* variant specification (a triple, actually) */
-	DATA1N_indicator    /* ISO2709 indicator */
-    } which;
+        /* the root of a record (containing global data) */
+#define DATA1N_root 1 
+        /* a tag */
+#define DATA1N_tag  2       
+        /* some data under a leaf tag or variant */
+#define DATA1N_data 3
+        /* variant specification (a triple, actually) */
+#define DATA1N_variant 4
+        /* ISO2709 indicator */
+#define DATA1N_indicator 5   
+    int which;
 
     union
     {
@@ -272,17 +343,23 @@ typedef struct data1_node
 	    int node_selected;
 	    int make_variantlist;
 	    int no_data_requested;
+	    int get_bytes;
 	} tag;
 
 	struct
 	{
-	    enum
-	    {
-		DATA1I_inctxt,      /* text inclusion */
-		DATA1I_incbin,      /* binary data inclusion */
-		DATA1I_text,        /* text data */
-		DATA1I_num          /* numerical data */
-	    } what;
+        /* text inclusion */
+#define DATA1I_inctxt 1
+        /* binary data inclusion */
+#define DATA1I_incbin 2
+        /* text data */
+#define DATA1I_text 3 
+        /* numerical data */
+#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 */
 #define DATA1_LOCALDATA 40
@@ -312,34 +389,44 @@ typedef struct data1_node
     struct data1_node *root;
 } data1_node;
 
-data1_node *get_parent_tag(data1_node *n);
-data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
+YAZ_EXPORT data1_node *get_parent_tag(data1_node *n);
+YAZ_EXPORT data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
     data1_absyn *absyn, NMEM m);
-data1_node *data1_read_record(int (*rf)(int, char *, size_t), int fd, NMEM m);
-data1_absyn *data1_read_absyn(char *file);
-data1_tag *data1_gettagbynum(data1_tagset *s, int type, int value);
-data1_tagset *data1_read_tagset(char *file);
-data1_element *data1_getelementbytagname(data1_absyn *abs,
+YAZ_EXPORT data1_node *data1_read_record(int (*rf)(void *, char *, size_t),
+    void *fh, NMEM m);
+YAZ_EXPORT data1_absyn *data1_read_absyn(char *file);
+YAZ_EXPORT data1_tag *data1_gettagbynum(data1_tagset *s, int type, int value);
+YAZ_EXPORT data1_tagset *data1_read_tagset(char *file);
+YAZ_EXPORT data1_element *data1_getelementbytagname(data1_absyn *abs,
     data1_element *parent, char *tagname);
-Z_GenericRecord *data1_nodetogr(data1_node *n, int select, ODR o);
-int data1_matchstr(char *s1, char *s2);
-data1_tag *data1_gettagbyname(data1_tagset *s, char *name);
-void data1_free_tree(data1_node *t);
-char *data1_nodetobuf(data1_node *n, int select, int *len);
-data1_node *data1_insert_taggeddata(data1_node *root, data1_node *at,
+YAZ_EXPORT Z_GenericRecord *data1_nodetogr(data1_node *n, int select, ODR o, int *len);
+YAZ_EXPORT data1_tag *data1_gettagbyname(data1_tagset *s, char *name);
+YAZ_EXPORT void data1_free_tree(data1_node *t);
+YAZ_EXPORT char *data1_nodetobuf(data1_node *n, int select, int *len);
+YAZ_EXPORT data1_node *data1_insert_taggeddata(data1_node *root, data1_node *at,
     char *tagname, NMEM m);
-data1_datatype data1_maptype(char *t);
-data1_varset *data1_read_varset(char *file);
-data1_vartype *data1_getvartypebyct(data1_varset *set, char *class, char *type);
-Z_Espec1 *data1_read_espec1(char *file, ODR o);
-int data1_doespec1(data1_node *n, Z_Espec1 *e);
-data1_esetname *data1_getesetbyname(data1_absyn *a, char *name);
-data1_element *data1_getelementbyname(data1_absyn *absyn, char *name);
-data1_node *data1_mk_node(NMEM m);
-data1_absyn *data1_get_absyn(char *name);
-data1_maptab *data1_read_maptab(char *file);
-data1_node *data1_map_record(data1_node *n, data1_maptab *map, NMEM m);
-data1_marctab *data1_read_marctab(char *file);
-char *data1_nodetomarc(data1_marctab *p, data1_node *n, int selected, int *len);
+YAZ_EXPORT data1_datatype data1_maptype(char *t);
+YAZ_EXPORT data1_varset *data1_read_varset(char *file);
+YAZ_EXPORT data1_vartype *data1_getvartypebyct(data1_varset *set, char *zclass, char *type);
+YAZ_EXPORT Z_Espec1 *data1_read_espec1(char *file, ODR o);
+YAZ_EXPORT int data1_doespec1(data1_node *n, Z_Espec1 *e);
+YAZ_EXPORT data1_esetname *data1_getesetbyname(data1_absyn *a, char *name);
+YAZ_EXPORT data1_element *data1_getelementbyname(data1_absyn *absyn, char *name);
+YAZ_EXPORT data1_node *data1_mk_node(NMEM m);
+YAZ_EXPORT data1_absyn *data1_get_absyn(char *name);
+YAZ_EXPORT data1_maptab *data1_read_maptab(char *file);
+YAZ_EXPORT data1_node *data1_map_record(data1_node *n, data1_maptab *map, NMEM m);
+YAZ_EXPORT data1_marctab *data1_read_marctab(char *file);
+YAZ_EXPORT char *data1_nodetomarc(data1_marctab *p, data1_node *n, int selected, int *len);
+YAZ_EXPORT char *data1_nodetoidsgml(data1_node *n, int select, int *len);
+YAZ_EXPORT Z_ExplainRecord *data1_nodetoexplain(data1_node *n, int select, ODR o);
+YAZ_EXPORT Z_BriefBib *data1_nodetosummary(data1_node *n, int select, ODR o);
+YAZ_EXPORT char *data1_nodetosoif(data1_node *n, int select, int *len);
+YAZ_EXPORT void data1_set_tabpath(const char *path);
+YAZ_EXPORT const char *data1_get_tabpath(void);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif