X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_map.c;h=f8c316918c5908286a6b4a2ed483c168facb5981;hp=9ff63132f5bd0607eb901793d5b739268b5ff7ce;hb=e2e073b5c947e996304ed7d577497af5e9a879ee;hpb=89d16cf15eda0e4802d18b8ad09bd3653508ebfc diff --git a/data1/d1_map.c b/data1/d1_map.c index 9ff6313..f8c3169 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) 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) @@ -345,6 +348,7 @@ data1_node *data1_map_record (data1_handle dh, data1_node *n, /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab