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
Version 2.0.46
[idzebra-moved-to-github.git]
/
data1
/
d1_handle.c
diff --git
a/data1/d1_handle.c
b/data1/d1_handle.c
index
68f4e02
..
cdb0caf
100644
(file)
--- a/
data1/d1_handle.c
+++ b/
data1/d1_handle.c
@@
-1,8
+1,5
@@
-/* $Id: d1_handle.c,v 1.14 2007-01-15 15:10:14 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) 1994-2011 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
@@
-89,7
+86,7
@@
void data1_destroy (data1_handle dh)
*/
data1_absyn_destroy(dh);
*/
data1_absyn_destroy(dh);
- wrbuf_free (dh->wrbuf, 1);
+ wrbuf_destroy(dh->wrbuf);
if (dh->tab_path)
xfree (dh->tab_path);
if (dh->tab_root)
if (dh->tab_path)
xfree (dh->tab_path);
if (dh->tab_root)
@@
-153,18
+150,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;
}
@@
-175,6
+175,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