-/* $Id: d1_handle.c,v 1.5 2004-11-19 10:26:53 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- 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
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>
#include <stdlib.h>
-#include <yaz/ylog.h>
+#include <yaz/log.h>
#include <idzebra/data1.h>
+#define DATA1_FLAG_XML 1
+
struct data1_handle_info {
WRBUF wrbuf;
char *tab_path;
int map_len;
NMEM mem;
- int flags;
};
-data1_handle data1_create (void)
-{
- return data1_createx(0);
-}
-
-data1_handle data1_createx (int flags)
+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();
p->absyn_cache = NULL;
p->attset_cache = NULL;
p->mem = nmem_create ();
- p->flags = flags;
return p;
}
*/
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)
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 dh->flags & DATA1_FLAG_XML;
+ return 1;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+