X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_map.c;h=46d9f71a87b28063aeaf7de02feda2b902da4b2d;hb=c66753469d139c4233a3572edf4b15b0497e0f28;hp=94ff9e8cb14a3d50a4d55a274a9ed21e75bb25cb;hpb=4eb3b54bb2ca9af74f39f000d3d40dba99ded887;p=idzebra-moved-to-github.git

diff --git a/data1/d1_map.c b/data1/d1_map.c
index 94ff9e8..46d9f71 100644
--- a/data1/d1_map.c
+++ b/data1/d1_map.c
@@ -1,6 +1,6 @@
-/* $Id: d1_map.c,v 1.7 2004-12-13 20:51:28 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: d1_map.c,v 1.13 2006-08-14 10:40:06 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>
@@ -42,10 +42,7 @@ 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;
@@ -329,7 +326,8 @@ 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);
@@ -346,9 +344,16 @@ data1_node *data1_map_record (data1_handle dh, data1_node *n,
 
     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
+ */
+