-/* $Id: open.c,v 1.20 2004-09-09 09:07:12 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: open.c,v 1.26 2006-08-14 10:40:09 adam Exp $
+ Copyright (C) 1995-2006
+ 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 <string.h>
#include <stdio.h>
-#include <dict.h>
+#include "dict-p.h"
Dict dict_open (BFiles bfs, const char *name, int cache, int rw,
int compact_flag, int page_size)
page_size = DICT_DEFAULT_PAGESIZE;
if (page_size < 2048)
{
- logf (LOG_WARN, "Page size for dict %s %d<2048. Set to 2048",
+ yaz_log (YLOG_WARN, "Page size for dict %s %d<2048. Set to 2048",
name, page_size);
page_size = 2048;
}
if(!dict->dbf)
{
- logf (LOG_WARN, "Cannot open `%s'", name);
+ yaz_log (YLOG_WARN, "Cannot open `%s'", name);
xfree (dict);
return NULL;
}
memcpy (&dict->head, head_buf, sizeof(dict->head));
if (strcmp (dict->head.magic_str, DICT_MAGIC))
{
- logf (LOG_WARN, "Bad magic of `%s'", name);
- exit (1);
+ yaz_log (YLOG_WARN, "Bad magic of `%s'", name);
+ dict_bf_close(dict->dbf);
+ xfree(dict);
+ return 0;
}
if (dict->head.page_size != page_size)
{
- logf (LOG_WARN, "Page size for existing dict %s is %d. Current is %d",
+ yaz_log (YLOG_WARN, "Page size for existing dict %s is %d. Current is %d",
name, dict->head.page_size, page_size);
}
}
{
return strlen((const char *) s);
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+