X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_handle.c;h=e5c4eaad1afaa87d3facafcaa7913d646129c982;hp=d12662667e890d5298ca160d3864d03ebe5d9182;hb=44621b084e8fdf06a45409754116e8810bd89664;hpb=89d16cf15eda0e4802d18b8ad09bd3653508ebfc diff --git a/data1/d1_handle.c b/data1/d1_handle.c index d126626..e5c4eaa 100644 --- a/data1/d1_handle.c +++ b/data1/d1_handle.c @@ -1,5 +1,5 @@ /* This file is part of the Zebra server. - Copyright (C) 1994-2009 Index Data + Copyright (C) 1994-2010 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 @@ -150,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); - 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); - f = yaz_fopen(path, file, "r", root); + if (!path || !*path) + return 0; + f = yaz_fopen(path, file, mode, root); if (!f) + { 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; } @@ -172,6 +175,7 @@ int data1_is_xmlmode(data1_handle dh) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab