X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_map.c;h=a7fea670c42b9d85912034df16728452b0ce9d32;hb=e63cb633d580e1a364de81d4f24fb2c9fa70e279;hp=8cd3bc957876af72f18d88e92d44c435d6fb7baf;hpb=519fefb91135ad52134b9fc4e82b3874f5525a2b;p=idzebra-moved-to-github.git

diff --git a/data1/d1_map.c b/data1/d1_map.c
index 8cd3bc9..a7fea67 100644
--- a/data1/d1_map.c
+++ b/data1/d1_map.c
@@ -1,21 +1,34 @@
-/*
- * Copyright (c) 1995-2002, Index Data.
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: d1_map.c,v 1.1 2002-10-22 12:53:33 adam Exp $
- */
+/* $Id: d1_map.c,v 1.8 2005-01-15 19:38:18 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
 
 #include <stdio.h>
 #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)
 {
@@ -30,7 +43,7 @@ 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;
     }
 
@@ -45,14 +58,14 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
 	{
 	    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;
 	    }
@@ -61,7 +74,7 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
 	{
 	    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;
 	    }
@@ -75,7 +88,7 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
 	{
 	    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);
@@ -88,7 +101,7 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
 
 	    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;
 	    }
@@ -115,7 +128,7 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
 		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;
@@ -144,7 +157,7 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
 	    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);
@@ -264,8 +277,27 @@ static int map_children(data1_handle dh, data1_node *n, data1_maptab *map,
 		    {
 			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)
@@ -299,7 +331,7 @@ data1_node *data1_map_record (data1_handle dh, data1_node *n,
     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))