projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Read-only sets uses common no write handler
[idzebra-moved-to-github.git]
/
data1
/
d1_map.c
diff --git
a/data1/d1_map.c
b/data1/d1_map.c
index
724ceb1
..
28bd6ad
100644
(file)
--- a/
data1/d1_map.c
+++ b/
data1/d1_map.c
@@
-1,8
+1,5
@@
-/* $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.
+/* This file is part of the Zebra server.
+ 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
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
@@
-20,6
+17,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-167,7
+167,7
@@
data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
}
mapp = &(*mapp)->next;
}
}
mapp = &(*mapp)->next;
}
- else
+ else
yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
file, lineno, argv[0]);
yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
file, lineno, argv[0]);
@@
-234,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));
{
*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);
(*m)->parent = parent;
(*m)->root = parent->root;
(*m)->child = dup_child(dh, n->child, &(*m)->last_child, mem, *m);
@@
-289,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);
{
cur = data1_mk_tag (
dh, mem, tag->names->name, 0, pn);
-
+
}
}
}
}
}
}
-
+
if (mt->next)
pn = cur;
else if (!m->no_data)
if (mt->next)
pn = cur;
else if (!m->no_data)
@@
-348,6
+348,7
@@
data1_node *data1_map_record (data1_handle dh, data1_node *n,
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab