-/* $Id: d1_map.c,v 1.2 2002-10-22 13:19:50 adam Exp $
+/* $Id: d1_map.c,v 1.7 2004-12-13 20:51:28 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#include <stdlib.h>
#include <string.h>
-#include <yaz/oid.h>
#include <yaz/log.h>
+#include <yaz/oid.h>
#include <yaz/readconf.h>
#include <yaz/tpath.h>
-#include <data1.h>
-#include <d1_map.h>
+#include <d1_absyn.h>
data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
{
if (!(f = data1_path_fopen(dh, file, "r")))
{
- yaz_log(LOG_WARN|LOG_ERRNO, "%s", file);
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", file);
return 0;
}
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # args for targetref",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # args for targetref",
file, lineno);
continue;
}
if ((res->target_absyn_ref = oid_getvalbyname(argv[1]))
== VAL_NONE)
{
- yaz_log(LOG_WARN, "%s:%d: Unknown reference '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown reference '%s'",
file, lineno, argv[1]);
continue;
}
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # args for targetname",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # args for targetname",
file, lineno);
continue;
}
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # args for name", file, lineno);
+ yaz_log(YLOG_WARN, "%s:%d: Bad # args for name", file, lineno);
continue;
}
res->name = (char *)nmem_malloc(mem, strlen(argv[1])+1);
if (argc < 3)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # of args for map",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # of args for map",
file, lineno);
continue;
}
if ((np = sscanf(path, "(%d,%511[^)]):%511[^/]", &type, valstr,
parm)) < 2)
{
- yaz_log(LOG_WARN, "%s:%d: Syntax error in map "
+ yaz_log(YLOG_WARN, "%s:%d: Syntax error in map "
"directive: %s", file, lineno, argv[2]);
fclose(f);
return 0;
mapp = &(*mapp)->next;
}
else
- yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
file, lineno, argv[0]);
fclose(f);
{
if (!cur || mt->new_field || !tagmatch(cur, mt))
{
- cur = data1_mk_node2 (dh, mem, DATA1N_tag, pn);
- cur->u.tag.tag = mt->value.string;
+ if (mt->which == D1_MAPTAG_string)
+ {
+ cur = data1_mk_node2 (dh, mem, DATA1N_tag, pn);
+ cur->u.tag.tag = mt->value.string;
+ }
+ else if (mt->which == D1_MAPTAG_numeric)
+ {
+ data1_tag *tag =
+ data1_gettagbynum(
+ dh,
+ pn->root->u.root.absyn->tagset,
+ mt->type,
+ mt->value.numeric);
+
+ if (tag && tag->names->name)
+ {
+ cur = data1_mk_tag (
+ dh, mem, tag->names->name, 0, pn);
+
+ }
+ }
}
if (mt->next)
res->u.root.type = map->target_absyn_name;
if (!(res->u.root.absyn = data1_get_absyn(dh, map->target_absyn_name)))
{
- yaz_log(LOG_WARN, "%s: Failed to load target absyn '%s'",
+ yaz_log(YLOG_WARN, "%s: Failed to load target absyn '%s'",
map->name, map->target_absyn_name);
}
if (data1_is_xmlmode(dh))