X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_map.c;h=28bd6adc7342ac8a319e32d96d67782077477ac8;hb=585e87e5a6b274a8ee13b5432a462afd95c04096;hp=a577315e6c10b94f25495cd9dfdb4ac9712ada7d;hpb=6a0f9234f945bc4956e2bcef75f715661a9eba9a;p=idzebra-moved-to-github.git diff --git a/data1/d1_map.c b/data1/d1_map.c index a577315..28bd6ad 100644 --- a/data1/d1_map.c +++ b/data1/d1_map.c @@ -1,5 +1,5 @@ /* This file is part of the Zebra server. - Copyright (C) 1994-2009 Index Data + Copyright (C) 2004-2013 Index Data Zebra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -17,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -164,7 +167,7 @@ data1_maptab *data1_read_maptab (data1_handle dh, const char *file) } mapp = &(*mapp)->next; } - else + else yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'", file, lineno, argv[0]); @@ -231,7 +234,7 @@ static data1_node *dup_child (data1_handle dh, data1_node *n, { *last = *m = (data1_node *) nmem_malloc (mem, sizeof(**m)); memcpy (*m, n, sizeof(**m)); - + (*m)->parent = parent; (*m)->root = parent->root; (*m)->child = dup_child(dh, n->child, &(*m)->last_child, mem, *m); @@ -286,11 +289,11 @@ static int map_children(data1_handle dh, data1_node *n, data1_maptab *map, { cur = data1_mk_tag ( dh, mem, tag->names->name, 0, pn); - + } } } - + if (mt->next) pn = cur; else if (!m->no_data)