X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=include%2Fidzebra%2Fdata1.h;h=58ac8cae9893fe27b12af4d80b699a6246e9cd31;hp=dc7c975121a652cbe1989713f6f16403724a7c61;hb=e7cf9381a4b902cb2b91053f80ab7899b7d5bb00;hpb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19

diff --git a/include/idzebra/data1.h b/include/idzebra/data1.h
index dc7c975..58ac8ca 100644
--- a/include/idzebra/data1.h
+++ b/include/idzebra/data1.h
@@ -1,5 +1,5 @@
-/* $Id: data1.h,v 1.7 2005-01-15 19:38:24 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: data1.h,v 1.14 2006-05-19 23:45:29 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -28,11 +28,10 @@ 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 <idzebra/util.h>
+
 #define d1_isspace(c) strchr(" \r\n\t\f", c)
 #define d1_isdigit(c) ((c) <= '9' && (c) >= '0')
 
@@ -53,12 +52,6 @@ YAZ_BEGIN_CDECL
 
 struct data1_attset;
 
-typedef struct data1_local_attribute
-{
-    int local;
-    struct data1_local_attribute *next;
-} data1_local_attribute;
-
 typedef struct data1_attset data1_attset;    
 typedef struct data1_att data1_att;
 typedef struct data1_attset_child data1_attset_child;
@@ -68,7 +61,6 @@ struct data1_att
     data1_attset *parent;          /* attribute set */
     char *name;                    /* symbolic name of this attribute */
     int value;                     /* attribute value */
-    data1_local_attribute *locals; /* local index values */
     data1_att *next;
 };
 
@@ -89,7 +81,7 @@ struct data1_attset
 typedef struct data1_handle_info *data1_handle;
 
 YAZ_EXPORT data1_att *data1_getattbyname(data1_handle dh, data1_attset *s,
-					 char *name);
+					 const char *name);
 YAZ_EXPORT data1_attset *data1_read_attset(data1_handle dh, const char *file);
 
 YAZ_EXPORT data1_attset *data1_empty_attset(data1_handle dh);
@@ -246,7 +238,7 @@ struct data1_tagset
 
 typedef struct data1_termlist
 {
-    data1_att *att;
+    char *index_name;
     char *structure;
     char *source;
     struct data1_termlist *next;
@@ -364,8 +356,6 @@ typedef struct data1_node
 
 YAZ_EXPORT data1_handle data1_create (void);
 
-#define DATA1_FLAG_XML  1
-YAZ_EXPORT data1_handle data1_createx (int flags);
 
 YAZ_EXPORT void data1_destroy(data1_handle dh);
 YAZ_EXPORT data1_node *get_parent_tag(data1_handle dh, data1_node *n);
@@ -407,7 +397,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);
@@ -588,3 +579,11 @@ YAZ_EXPORT void data1_absyn_destroy(data1_handle dh);
 YAZ_END_CDECL
 
 #endif
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+