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
zebra_it_key_str_dump prints escaped ICU dictionary entries
[idzebra-moved-to-github.git]
/
data1
/
d1_handle.c
diff --git
a/data1/d1_handle.c
b/data1/d1_handle.c
index
d126626
..
e2bfd37
100644
(file)
--- a/
data1/d1_handle.c
+++ b/
data1/d1_handle.c
@@
-1,5
+1,5
@@
/* This file is part of the Zebra server.
/* 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
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 <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-79,9
+82,9
@@
void data1_destroy (data1_handle dh)
{
if (!dh)
return;
{
if (!dh)
return;
-
+
/* *ostrich*
/* *ostrich*
- We need to destroy DFAs, in xp_element (xelm) definitions
+ We need to destroy DFAs, in xp_element (xelm) definitions
pop, 2002-12-13
*/
data1_absyn_destroy(dh);
pop, 2002-12-13
*/
data1_absyn_destroy(dh);
@@
-96,7
+99,7
@@
void data1_destroy (data1_handle dh)
if (dh->map_buf)
xfree (dh->map_buf);
nmem_destroy (dh->mem);
if (dh->map_buf)
xfree (dh->map_buf);
nmem_destroy (dh->mem);
-
+
xfree (dh);
}
xfree (dh);
}
@@
-150,18
+153,21
@@
FILE *data1_path_fopen (data1_handle dh, const char *file, const char *mode)
FILE *f;
const char *path = data1_get_tabpath(dh);
const char *root = data1_get_tabroot(dh);
FILE *f;
const char *path = data1_get_tabpath(dh);
const char *root = data1_get_tabroot(dh);
- if (!path || !*path)
- {
- yaz_log(YLOG_DEBUG, "data1_fath_fopen file=%s mode=%s no open",
- file, mode);
- return 0;
- }
- yaz_log(YLOG_DEBUG, "data1_fath_fopen path=%s root=%s "
+
+ yaz_log(YLOG_DEBUG, "data1_path_fopen path=%s root=%s "
"file=%s mode=%s", path ? path : "NULL",
root ? root : "NULL", file, mode);
"file=%s mode=%s", path ? path : "NULL",
root ? root : "NULL", file, mode);
- f = yaz_fopen(path, file, "r", root);
+ if (!path || !*path)
+ return 0;
+ f = yaz_fopen(path, file, mode, root);
if (!f)
if (!f)
+ {
yaz_log(YLOG_WARN|YLOG_ERRNO, "Couldn't open %s", file);
yaz_log(YLOG_WARN|YLOG_ERRNO, "Couldn't open %s", file);
+ if (root)
+ yaz_log(YLOG_LOG, "for root=%s", root);
+ if (path)
+ yaz_log(YLOG_LOG, "for profilePath=%s", path);
+ }
return f;
}
return f;
}
@@
-172,6
+178,7
@@
int data1_is_xmlmode(data1_handle dh)
/*
* 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