-/* $Id: d1_handle.c,v 1.11 2006-05-10 08:13:18 adam Exp $
- Copyright (C) 1995-2005
+/* $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.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
#include <stdio.h>
{
data1_handle p = (data1_handle)xmalloc (sizeof(*p));
if (!p)
- return NULL;
+ return 0;
p->tab_path = NULL;
p->tab_root = NULL;
p->wrbuf = wrbuf_alloc();
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);
- yaz_log(YLOG_DEBUG, "data1_fath_fopen file=%s mode=%s", file, mode);
- return yaz_fopen (path, file, "r", root);
+ 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 "
+ "file=%s mode=%s", path ? path : "NULL",
+ root ? root : "NULL", file, mode);
+ f = yaz_fopen(path, file, "r", root);
+ if (!f)
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "Couldn't open %s", file);
+ return f;
}
int data1_is_xmlmode(data1_handle dh)