X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_map.c;h=9f2d2d65241fdd76e94ac477d1e6bbc879fbcc49;hb=8b2d919ca1ab2134c098057bb0965ec7dc42cd9d;hp=78ca215b0440906e972b5ebddf8f328cc04803e1;hpb=d1e1a6a2a574e8019e700abb9d8a9d03ba41aab5;p=idzebra-moved-to-github.git

diff --git a/data1/d1_map.c b/data1/d1_map.c
index 78ca215..9f2d2d6 100644
--- a/data1/d1_map.c
+++ b/data1/d1_map.c
@@ -1,5 +1,5 @@
-/* $Id: d1_map.c,v 1.12 2006-07-06 11:40:23 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: d1_map.c,v 1.14 2006-08-22 10:21:53 adam Exp $
+   Copyright (C) 1995-2006
    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>
@@ -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;
 }