2007.

[idzebra-moved-to-github.git] / data1 / d1_map.c

diff --git a/data1/d1_map.c b/data1/d1_map.c
index 46d9f71..b92ad0a 100644 (file)
--- a/data1/d1_map.c
+++ b/data1/d1_map.c
@@ -1,5 +1,5 @@
-/* $Id: d1_map.c,v 1.13 2006-08-14 10:40:06 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: d1_map.c,v 1.15 2007-01-15 15:10:14 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -332,20 +332,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)
-    {
        return 0;
-    }
     return res;
 }