X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_map.c;h=997b9cb0ca8aed66aa97cf4d1d08415bd1099792;hp=1b746a156333a3391ac804a6e1009c057091b9c6;hb=1872e3fc60b482771bbd1cb4b0290b8d6a9ef5d0;hpb=5437b50633032595afe6f87dc0f989bc92a5aea8

diff --git a/data1/d1_map.c b/data1/d1_map.c
index 1b746a1..997b9cb 100644
--- a/data1/d1_map.c
+++ b/data1/d1_map.c
@@ -1,6 +1,6 @@
-/* $Id: d1_map.c,v 1.6 2004-11-19 10:26:53 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $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,17 +15,17 @@ 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>
 #include <stdlib.h>
 #include <string.h>
 
-#include <yaz/oid.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
+#include <yaz/oid_db.h>
 #include <yaz/readconf.h>
 #include <yaz/tpath.h>
 #include <d1_absyn.h>
@@ -42,13 +42,10 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
     int local_numeric = 0;
 
     if (!(f = data1_path_fopen(dh, file, "r")))
-    {
-	yaz_log(YLOG_WARN|YLOG_ERRNO, "%s", file);
 	return 0;
-    }
 
     res->name = 0;
-    res->target_absyn_ref = VAL_NONE;
+    res->oid = 0;
     res->map = 0;
     mapp = &res->map;
     res->next = 0;
@@ -62,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]);
@@ -329,26 +327,28 @@ 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;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+