Register type (w,p) + set-use/string attriute combined in register

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

diff --git a/include/idzebra/data1.h b/include/idzebra/data1.h
index 6596cb6..a470854 100644 (file)
--- a/include/idzebra/data1.h
+++ b/include/idzebra/data1.h
@@ -1,6 +1,6 @@
-/* $Id: data1.h,v 1.2 2004-09-28 10:43:37 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: data1.h,v 1.10 2005-06-23 06:45:46 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -28,10 +28,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <yaz/nmem.h>
 #include <yaz/oid.h>
 #include <yaz/proto.h>
-
-#include <idzebra/version.h>
 #include <yaz/yaz-util.h>
-#include <yaz/wrbuf.h>
+
+#include <idzebra/util.h>
 
 #define d1_isspace(c) strchr(" \r\n\t\f", c)
 #define d1_isdigit(c) ((c) <= '9' && (c) >= '0')
@@ -246,7 +245,11 @@ struct data1_tagset
 
 typedef struct data1_termlist
 {
+#if NATTR
+    char *index_name;
+#else
     data1_att *att;
+#endif
     char *structure;
     char *source;
     struct data1_termlist *next;
@@ -264,6 +267,7 @@ typedef struct data1_element
     char *sub_name;
     struct data1_element *children;
     struct data1_element *next;
+    struct data1_hash_table *hash;
 } data1_element;
 
 typedef struct data1_sub_elements {
@@ -406,7 +410,8 @@ YAZ_EXPORT data1_datatype data1_maptype(data1_handle dh, char *t);
 YAZ_EXPORT data1_varset *data1_read_varset(data1_handle dh, const char *file);
 YAZ_EXPORT data1_vartype *data1_getvartypebyct(data1_handle dh,
                                               data1_varset *set,
-                                              char *zclass, char *type);
+                                              const char *zclass,
+                                              const char *type);
 YAZ_EXPORT data1_vartype *data1_getvartypeby_absyn(data1_handle dh,
                                                   data1_absyn *absyn,
                                                   char *zclass, char *type);