-/*
- * Copyright (c) 1995-2002, Index Data.
- * See the file LICENSE for details.
- *
- * $Id: d1_handle.c,v 1.1 2002-10-22 12:53:33 adam Exp $
- */
+/* $Id: d1_handle.c,v 1.15 2007-03-19 21:50:39 adam Exp $
+ Copyright (C) 1995-2007
+ Index Data ApS
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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 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/log.h>
-#include <data1.h>
+#include <idzebra/data1.h>
+
+#define DATA1_FLAG_XML 1
struct data1_handle_info {
WRBUF wrbuf;
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;
}
{
if (!dh)
return;
- wrbuf_free (dh->wrbuf, 1);
+
+ /* *ostrich*
+ We need to destroy DFAs, in xp_element (xelm) definitions
+ pop, 2002-12-13
+ */
+ data1_absyn_destroy(dh);
+
+ wrbuf_destroy(dh->wrbuf);
if (dh->tab_path)
xfree (dh->tab_path);
if (dh->tab_root)
char **data1_get_read_buf (data1_handle dp, int **lenp)
{
*lenp = &dp->read_len;
- yaz_log (LOG_DEBUG, "data1_get_read_buf lenp=%u", **lenp);
+ yaz_log (YLOG_DEBUG, "data1_get_read_buf lenp=%u", **lenp);
return &dp->read_buf;
}
char **data1_get_map_buf (data1_handle dp, int **lenp)
{
*lenp = &dp->map_len;
- yaz_log (LOG_DEBUG, "data1_get_map_buf lenp=%u", **lenp);
+ yaz_log (YLOG_DEBUG, "data1_get_map_buf lenp=%u", **lenp);
return &dp->map_buf;
}
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
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+