X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=data1%2Fd1_map.c;h=997b9cb0ca8aed66aa97cf4d1d08415bd1099792;hb=1b8e1d7dfece31918056f76819c18675ed6e781e;hp=72ef9303687d4324cc6ac9b67bd0263d2e4dc6ea;hpb=b88909df16157ed1e7859bc3fad6b01520d4865e;p=idzebra-moved-to-github.git

diff --git a/data1/d1_map.c b/data1/d1_map.c
index 72ef930..997b9cb 100644
--- a/data1/d1_map.c
+++ b/data1/d1_map.c
@@ -1,5 +1,5 @@
-/* $Id: d1_map.c,v 1.11 2006-06-13 12:02:02 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: d1_map.c,v 1.16 2007-04-16 08:44:31 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ 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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <stdio.h>
@@ -25,7 +25,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #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>
@@ -45,7 +45,7 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
 	return 0;
 
     res->name = 0;
-    res->target_absyn_ref = VAL_NONE;
+    res->oid = 0;
     res->map = 0;
     mapp = &res->map;
     res->next = 0;
@@ -59,8 +59,9 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
 			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]);
@@ -332,21 +333,14 @@ data1_node *data1_map_record (data1_handle dh, data1_node *n,
 	yaz_log(YLOG_WARN, "%s: Failed to load target absyn '%s'",
 		map->name, map->target_absyn_name);
     }
-    if (data1_is_xmlmode(dh))
-    {
-        n = n->child;
-        if (!n)
-            return 0;
-        res1 = data1_mk_tag (dh, m, map->target_absyn_name, 0, res);
-    }
-    else
-        res1 = res;
-
+    n = n->child;
+    if (!n)
+        return 0;
+    res1 = data1_mk_tag (dh, m, map->target_absyn_name, 0, res);
+    while (n && n->which != DATA1N_tag)
+        n = n->next;
     if (map_children(dh, n, map, res1, m) < 0)
-    {
-	data1_free_tree(dh, res);
 	return 0;
-    }
     return res;
 }