X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_handle.c;h=332cbf30f7a4e76d21ba2ce7e21f7c3d90c783fd;hb=54bf7dc88056fa2a813786e72dfea55b7c0e3e40;hp=2c5f853a44a903e91e806365676e2d8d6a550806;hpb=074e63e27b02896c927606ce5bb324a55613dd31;p=idzebra-moved-to-github.git

diff --git a/data1/d1_handle.c b/data1/d1_handle.c
index 2c5f853..332cbf3 100644
--- a/data1/d1_handle.c
+++ b/data1/d1_handle.c
@@ -1,4 +1,4 @@
-/* $Id: d1_handle.c,v 1.8 2006-03-29 10:43:23 adam Exp $
+/* $Id: d1_handle.c,v 1.12 2006-06-08 10:33:19 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -49,7 +49,7 @@ data1_handle data1_create(void)
 {
     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();
@@ -150,12 +150,33 @@ const char *data1_get_tabroot (data1_handle dp)
 
 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);
-    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)
 {
     return 1;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+