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

diff --git a/data1/d1_map.c b/data1/d1_map.c
index 5bbe680..724ceb1 100644
--- a/data1/d1_map.c
+++ b/data1/d1_map.c
@@ -1,5 +1,5 @@
-/* $Id: d1_map.c,v 1.10 2006-06-08 10:33:19 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: d1_map.c,v 1.17 2007-06-27 22:17:20 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,11 +25,20 @@ 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>
 
+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);
@@ -45,7 +54,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 +68,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]);
@@ -108,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]);
@@ -162,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)
@@ -304,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);
+                            }
 			}
 		    }
 		}
@@ -326,26 +328,20 @@ data1_node *data1_map_record (data1_handle dh, data1_node *n,
 
     res->which = DATA1N_root;
     res->u.root.type = map->target_absyn_name;
-    if (!(res->u.root.absyn = data1_get_absyn(dh, map->target_absyn_name)))
+    if (!(res->u.root.absyn = data1_get_absyn(dh, map->target_absyn_name,
+                                              DATA1_XPATH_INDEXING_ENABLE)))
     {
 	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;
 }