projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Not using the deprecated yaz-util.h any more
[idzebra-moved-to-github.git]
/
include
/
idzebra
/
data1.h
diff --git
a/include/idzebra/data1.h
b/include/idzebra/data1.h
index
6596cb6
..
aec53b6
100644
(file)
--- a/
include/idzebra/data1.h
+++ b/
include/idzebra/data1.h
@@
-1,4
+1,4
@@
-/* $Id: data1.h,v 1.2 2004-09-28 10:43:37 adam Exp $
+/* $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
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-30,8
+30,19
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <yaz/proto.h>
#include <idzebra/version.h>
#include <yaz/proto.h>
#include <idzebra/version.h>
-#include <yaz/yaz-util.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/wrbuf.h>
+#include <yaz/nmem.h>
+#include <yaz/readconf.h>
+#include <yaz/marcdisp.h>
+#include <yaz/yaz-iconv.h>
#define d1_isspace(c) strchr(" \r\n\t\f", c)
#define d1_isdigit(c) ((c) <= '9' && (c) >= '0')
#define d1_isspace(c) strchr(" \r\n\t\f", c)
#define d1_isdigit(c) ((c) <= '9' && (c) >= '0')
@@
-264,6
+275,7
@@
typedef struct data1_element
char *sub_name;
struct data1_element *children;
struct data1_element *next;
char *sub_name;
struct data1_element *children;
struct data1_element *next;
+ struct data1_hash_table *hash;
} data1_element;
typedef struct data1_sub_elements {
} data1_element;
typedef struct data1_sub_elements {