/*
- * Copyright (c) 1995-1999, Index Data.
+ * Copyright (c) 1995-2000, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_map.c,v $
- * Revision 1.15 1999-08-27 09:40:32 adam
+ * Revision 1.18 2000-11-29 14:22:47 adam
+ * Implemented XML/SGML attributes for data1 so that d1_read reads them
+ * and d1_write generates proper attributes for XML/SGML records. Added
+ * register locking for threaded version.
+ *
+ * Revision 1.17 1999/11/30 13:47:12 adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.16 1999/10/21 12:06:29 adam
+ * Retrieval module no longer uses ctype.h - functions.
+ *
+ * Revision 1.15 1999/08/27 09:40:32 adam
* Renamed logf function to yaz_log. Removed VC++ project files.
*
* Revision 1.14 1998/10/13 16:09:50 adam
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
-#include <oid.h>
-#include <log.h>
-#include <readconf.h>
-
-#include <tpath.h>
-#include <data1.h>
-#include <d1_map.h>
+#include <yaz/oid.h>
+#include <yaz/log.h>
+#include <yaz/readconf.h>
+#include <yaz/tpath.h>
+#include <yaz/data1.h>
+#include <yaz/d1_map.h>
data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
{
(*mtp)->new_field = 1;
else
(*mtp)->new_field = 0;
- if ((type != 3 || local_numeric) && isdigit(*valstr))
+ if ((type != 3 || local_numeric) && d1_isdigit(*valstr))
{
(*mtp)->which = D1_MAPTAG_numeric;
(*mtp)->value.numeric = atoi(valstr);
{
if (!cur || mt->new_field || !tagmatch(cur, mt))
{
- cur = data1_mk_node (dh, mem);
- cur->which = DATA1N_tag;
- cur->u.tag.element = 0;
+ cur = data1_mk_node_type (dh, mem, DATA1N_tag);
cur->u.tag.tag = mt->value.string;
- cur->u.tag.node_selected = 0;
+
cur->parent = pn;
cur->root = pn->root;
if (!pn->child)