X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fidzebra%2Fdata1.h;h=a470854616b087b64cde3d8631c8553f81c20590;hb=7f02bad575a64004a3a0122a99666afd41dd8966;hp=aec53b6b07913fc90d9fddb754199618fb5c60a8;hpb=eab4cdc5571ca8811ebaae09358b223b7debc02f;p=idzebra-moved-to-github.git

diff --git a/include/idzebra/data1.h b/include/idzebra/data1.h
index aec53b6..a470854 100644
--- a/include/idzebra/data1.h
+++ b/include/idzebra/data1.h
@@ -1,6 +1,6 @@
-/* $Id: data1.h,v 1.5 2004-12-10 11:56:21 heikki 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,21 +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 <yaz/yaz-util.h>
 
-#include <idzebra/version.h>
-
-/* Old yaz-util includes */
-#include <yaz/yconfig.h>
-#include <yaz/yaz-version.h>
-#include <yaz/xmalloc.h>
-#include <yaz/ylog.h>  
-#include <yaz/tpath.h>
-#include <yaz/options.h>
-#include <yaz/wrbuf.h>
-#include <yaz/nmem.h>
-#include <yaz/readconf.h>
-#include <yaz/marcdisp.h>
-#include <yaz/yaz-iconv.h>
+#include <idzebra/util.h>
 
 #define d1_isspace(c) strchr(" \r\n\t\f", c)
 #define d1_isdigit(c) ((c) <= '9' && (c) >= '0')
@@ -257,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;
@@ -418,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);