X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_map.c;h=724ceb16f19eb6d95db8dc3a9244e8ce305c0ec1;hp=997b9cb0ca8aed66aa97cf4d1d08415bd1099792;hb=676ae79af06721621b1f66bdaec06164b3ba7b1f;hpb=ca820b5e84bec416bf0f5790d1aac509842b4faf

diff --git a/data1/d1_map.c b/data1/d1_map.c
index 997b9cb..724ceb1 100644
--- a/data1/d1_map.c
+++ b/data1/d1_map.c
@@ -1,4 +1,4 @@
-/* $Id: d1_map.c,v 1.16 2007-04-16 08:44:31 adam Exp $
+/* $Id: d1_map.c,v 1.17 2007-06-27 22:17:20 adam Exp $
    Copyright (C) 1995-2007
    Index Data ApS
 
@@ -30,6 +30,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/tpath.h>
 #include <d1_absyn.h>
 
+struct data1_mapunit
+{
+    int no_data;
+    int no_chop;
+    char *source_element_name;
+    data1_maptag *target_path;
+    struct data1_mapunit *next;
+};
+
 data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
 {
     NMEM mem = data1_nmem_get (dh);
@@ -109,6 +118,10 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
 		(*mapp)->no_data = 1;
 	    else
 		(*mapp)->no_data = 0;
+	    if (argc > 3 && !data1_matchstr(argv[3], "nochop"))
+		(*mapp)->no_chop = 1;
+	    else
+		(*mapp)->no_chop = 0;
 	    (*mapp)->source_element_name =
 		(char *)nmem_malloc(mem, strlen(argv[1])+1);
 	    strcpy((*mapp)->source_element_name, argv[1]);
@@ -163,23 +176,6 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
 }
 
 /*
- * Locate node with given elementname.
- * NOTE: This is stupid - we don't find repeats this way.
- */
-static data1_node *find_node(data1_node *p, char *elementname)
-{
-    data1_node *c, *r;
-
-    for (c = p->child; c; c = c->next)
-	if (c->which == DATA1N_tag && c->u.tag.element &&
-	    !data1_matchstr(c->u.tag.element->name, elementname))
-	    return c;
-	else if ((r = find_node(c, elementname)))
-	    return r;
-    return 0;
-}
-
-/*
  * See if the node n is equivalent to the tag t.
  */
 static int tagmatch(data1_node *n, data1_maptag *t)
@@ -305,6 +301,11 @@ static int map_children(data1_handle dh, data1_node *n, data1_maptab *map,
                             cur->child =
                                 dup_child (dh, c->child,
                                            &cur->last_child, mem, cur);
+                            if (!m->no_chop)
+                            {
+                                data1_concat_text(dh, mem, cur->child);
+                                data1_chop_text(dh, mem, cur->child);
+                            }
 			}
 		    }
 		}