X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fdata1.h;h=e97e8d4218fb87f64f6d5117cbebe21eff4fbd80;hp=6fe793856f964d74a33bf4e71932830aa0fa631e;hb=de40d7c17747988ed4c53e51e45cbb790a3abd7b;hpb=9446211daf0869d342b5738d153d810230b7a299

diff --git a/include/data1.h b/include/data1.h
index 6fe7938..e97e8d4 100644
--- a/include/data1.h
+++ b/include/data1.h
@@ -24,7 +24,25 @@
  * OF THIS SOFTWARE.
  *
  * $Log: data1.h,v $
- * Revision 1.7  1995-12-12 16:37:05  quinn
+ * 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
  * Added destroy element to data1_node.
  *
  * Revision 1.6  1995/12/11  15:22:12  quinn
@@ -92,12 +110,15 @@
 
 #include <stdio.h>
 
+#include <nmem.h>
 #include <oid.h>
 #include <proto.h>
 
 #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
@@ -279,6 +300,7 @@ typedef struct data1_node
 		DATA1I_text,        /* text data */
 		DATA1I_num          /* numerical data */
 	    } what;
+	    int formatted_text;     /* newlines are significant */
 	    int len;
 	    char *data;      /* filename or data */
 #define DATA1_LOCALDATA 40
@@ -310,8 +332,9 @@ typedef struct data1_node
 
 data1_node *get_parent_tag(data1_node *n);
 data1_node *data1_read_node(char **buf, data1_node *parent, int *line,
-    data1_absyn *absyn);
-data1_node *data1_read_record(int (*rf)(int, char *, size_t), int fd);
+    data1_absyn *absyn, NMEM m);
+data1_node *data1_read_record(int (*rf)(void *, char *, size_t),
+    void *fh, 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);
@@ -323,7 +346,7 @@ 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,
-    char *tagname);
+    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);
@@ -331,11 +354,13 @@ 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(void);
+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);
+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);
+char *data1_nodetoidsgml(data1_node *n, int select, int *len);
+Z_ExplainRecord *data1_nodetoexplain(data1_node *n, int select, ODR o);
 
 #endif