-/* $Id: d1_map.c,v 1.15 2007-01-15 15:10:14 adam Exp $
+/* $Id: d1_map.c,v 1.17 2007-06-27 22:17:20 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
#include <string.h>
#include <yaz/log.h>
-#include <yaz/oid.h>
+#include <yaz/oid_db.h>
#include <yaz/readconf.h>
#include <yaz/tpath.h>
#include <d1_absyn.h>
+struct data1_mapunit
+{
+ int no_data;
+ int no_chop;
+ char *source_element_name;
+ data1_maptag *target_path;
+ struct data1_mapunit *next;
+};
+
data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
{
NMEM mem = data1_nmem_get (dh);
return 0;
res->name = 0;
- res->target_absyn_ref = VAL_NONE;
+ res->oid = 0;
res->map = 0;
mapp = &res->map;
res->next = 0;
file, lineno);
continue;
}
- if ((res->target_absyn_ref = oid_getvalbyname(argv[1]))
- == VAL_NONE)
+ res->oid = yaz_string_to_oid_nmem(yaz_oid_std(),
+ CLASS_RECSYN, argv[1], mem);
+ if (!res->oid)
{
yaz_log(YLOG_WARN, "%s:%d: Unknown reference '%s'",
file, lineno, argv[1]);
(*mapp)->no_data = 1;
else
(*mapp)->no_data = 0;
+ if (argc > 3 && !data1_matchstr(argv[3], "nochop"))
+ (*mapp)->no_chop = 1;
+ else
+ (*mapp)->no_chop = 0;
(*mapp)->source_element_name =
(char *)nmem_malloc(mem, strlen(argv[1])+1);
strcpy((*mapp)->source_element_name, argv[1]);
}
/*
- * Locate node with given elementname.
- * NOTE: This is stupid - we don't find repeats this way.
- */
-static data1_node *find_node(data1_node *p, char *elementname)
-{
- data1_node *c, *r;
-
- for (c = p->child; c; c = c->next)
- if (c->which == DATA1N_tag && c->u.tag.element &&
- !data1_matchstr(c->u.tag.element->name, elementname))
- return c;
- else if ((r = find_node(c, elementname)))
- return r;
- return 0;
-}
-
-/*
* See if the node n is equivalent to the tag t.
*/
static int tagmatch(data1_node *n, data1_maptag *t)
cur->child =
dup_child (dh, c->child,
&cur->last_child, mem, cur);
+ if (!m->no_chop)
+ {
+ data1_concat_text(dh, mem, cur->child);
+ data1_chop_text(dh, mem, cur->child);
+ }
}
}
}