More verbose data1_path_fopen if fopen fails

[idzebra-moved-to-github.git] / data1 / d1_handle.c

diff --git a/data1/d1_handle.c b/data1/d1_handle.c
index 332cbf3..e5c4eaa 100644 (file)
--- a/data1/d1_handle.c
+++ b/data1/d1_handle.c
@@ -1,8 +1,5 @@
-/* $Id: d1_handle.c,v 1.12 2006-06-08 10:33:19 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   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
@@ -15,9 +12,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 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>
@@ -89,7 +86,7 @@ void data1_destroy (data1_handle 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)
@@ -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);
-    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;
 }
 
@@ -175,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