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
Deal with double unlocks (which does happen sometimes)
[idzebra-moved-to-github.git]
/
data1
/
d1_map.c
diff --git
a/data1/d1_map.c
b/data1/d1_map.c
index
151b3c4
..
72ef930
100644
(file)
--- a/
data1/d1_map.c
+++ b/
data1/d1_map.c
@@
-1,6
+1,6
@@
-/* $Id: d1_map.c,v 1.5 2004-09-28 10:43:37 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: d1_map.c,v 1.11 2006-06-13 12:02:02 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-24,8
+24,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#include <yaz/oid.h>
#include <yaz/log.h>
#include <yaz/log.h>
+#include <yaz/oid.h>
#include <yaz/readconf.h>
#include <yaz/tpath.h>
#include <d1_absyn.h>
#include <yaz/readconf.h>
#include <yaz/tpath.h>
#include <d1_absyn.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")))
int local_numeric = 0;
if (!(f = data1_path_fopen(dh, file, "r")))
- {
- yaz_log(LOG_WARN|LOG_ERRNO, "%s", file);
return 0;
return 0;
- }
res->name = 0;
res->target_absyn_ref = VAL_NONE;
res->name = 0;
res->target_absyn_ref = VAL_NONE;
@@
-58,14
+55,14
@@
data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
{
if (argc != 2)
{
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # args for targetref",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # args for targetref",
file, lineno);
continue;
}
if ((res->target_absyn_ref = oid_getvalbyname(argv[1]))
== VAL_NONE)
{
file, lineno);
continue;
}
if ((res->target_absyn_ref = oid_getvalbyname(argv[1]))
== VAL_NONE)
{
- yaz_log(LOG_WARN, "%s:%d: Unknown reference '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown reference '%s'",
file, lineno, argv[1]);
continue;
}
file, lineno, argv[1]);
continue;
}
@@
-74,7
+71,7
@@
data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
{
if (argc != 2)
{
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # args for targetname",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # args for targetname",
file, lineno);
continue;
}
file, lineno);
continue;
}
@@
-88,7
+85,7
@@
data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
{
if (argc != 2)
{
{
if (argc != 2)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # args for name", file, lineno);
+ yaz_log(YLOG_WARN, "%s:%d: Bad # args for name", file, lineno);
continue;
}
res->name = (char *)nmem_malloc(mem, strlen(argv[1])+1);
continue;
}
res->name = (char *)nmem_malloc(mem, strlen(argv[1])+1);
@@
-101,7
+98,7
@@
data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
if (argc < 3)
{
if (argc < 3)
{
- yaz_log(LOG_WARN, "%s:%d: Bad # of args for map",
+ yaz_log(YLOG_WARN, "%s:%d: Bad # of args for map",
file, lineno);
continue;
}
file, lineno);
continue;
}
@@
-128,7
+125,7
@@
data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
if ((np = sscanf(path, "(%d,%511[^)]):%511[^/]", &type, valstr,
parm)) < 2)
{
if ((np = sscanf(path, "(%d,%511[^)]):%511[^/]", &type, valstr,
parm)) < 2)
{
- yaz_log(LOG_WARN, "%s:%d: Syntax error in map "
+ yaz_log(YLOG_WARN, "%s:%d: Syntax error in map "
"directive: %s", file, lineno, argv[2]);
fclose(f);
return 0;
"directive: %s", file, lineno, argv[2]);
fclose(f);
return 0;
@@
-157,7
+154,7
@@
data1_maptab *data1_read_maptab (data1_handle dh, const char *file)
mapp = &(*mapp)->next;
}
else
mapp = &(*mapp)->next;
}
else
- yaz_log(LOG_WARN, "%s:%d: Unknown directive '%s'",
+ yaz_log(YLOG_WARN, "%s:%d: Unknown directive '%s'",
file, lineno, argv[0]);
fclose(f);
file, lineno, argv[0]);
fclose(f);
@@
-329,9
+326,10
@@
data1_node *data1_map_record (data1_handle dh, data1_node *n,
res->which = DATA1N_root;
res->u.root.type = map->target_absyn_name;
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(LOG_WARN, "%s: Failed to load target absyn '%s'",
+ yaz_log(YLOG_WARN, "%s: Failed to load target absyn '%s'",
map->name, map->target_absyn_name);
}
if (data1_is_xmlmode(dh))
map->name, map->target_absyn_name);
}
if (data1_is_xmlmode(dh))
@@
-352,3
+350,11
@@
data1_node *data1_map_record (data1_handle dh, data1_node *n,
return res;
}
return res;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+