X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fopen.c;h=d31252f61ba005d9850e06f8bb4191770311bd86;hp=d43476b5cb0c3f9afafa2340e669082a3d6dec78;hb=5d536c8cf5400b1e4da91061cf736a9ab53e5bd1;hpb=f76093fc0b3b07a5b5a9d83e4c62dd467df8f53d diff --git a/dict/open.c b/dict/open.c index d43476b..d31252f 100644 --- a/dict/open.c +++ b/dict/open.c @@ -1,40 +1,59 @@ -/* $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 - -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 Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +/* This file is part of the Zebra server. + Copyright (C) 1994-2011 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 + 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 + */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include -#include +#include "dict-p.h" + +void dict_clean(Dict dict) +{ + int page_size = dict->head.page_size; + void *head_buf; + int compact_flag = dict->head.compact_flag; + + memset(dict->head.magic_str, 0, sizeof(dict->head.magic_str)); + strcpy(dict->head.magic_str, DICT_MAGIC); + dict->head.last = 1; + dict->head.root = 0; + dict->head.freelist = 0; + dict->head.page_size = page_size; + dict->head.compact_flag = compact_flag; + + /* create header with information (page 0) */ + if (dict->rw) + dict_bf_newp(dict->dbf, 0, &head_buf, page_size); +} -Dict dict_open (BFiles bfs, const char *name, int cache, int rw, - int compact_flag, int page_size) +Dict dict_open(BFiles bfs, const char *name, int cache, int rw, + int compact_flag, int page_size) { Dict dict; void *head_buf; - dict = (Dict) xmalloc (sizeof(*dict)); + dict = (Dict) xmalloc(sizeof(*dict)); if (cache < 5) cache = 5; @@ -43,45 +62,42 @@ Dict dict_open (BFiles bfs, const char *name, int cache, int rw, page_size = DICT_DEFAULT_PAGESIZE; if (page_size < 2048) { - logf (LOG_WARN, "Page size for dict %s %d<2048. Set to 2048", - name, page_size); + yaz_log(YLOG_WARN, "Page size for dict %s %d<2048. Set to 2048", + name, page_size); page_size = 2048; } - dict->dbf = dict_bf_open (bfs, name, page_size, cache, rw); + dict->dbf = dict_bf_open(bfs, name, page_size, cache, rw); dict->rw = rw; + dict->no_split = 0; + dict->no_insert = 0; + dict->no_lookup = 0; if(!dict->dbf) { - logf (LOG_WARN, "Cannot open `%s'", name); - xfree (dict); + yaz_log(YLOG_WARN, "Cannot open `%s'", name); + xfree(dict); return NULL; } - if (dict_bf_readp (dict->dbf, 0, &head_buf) <= 0) + if (dict_bf_readp(dict->dbf, 0, &head_buf) <= 0) { - memset (dict->head.magic_str, 0, sizeof(dict->head.magic_str)); - strcpy (dict->head.magic_str, DICT_MAGIC); - dict->head.last = 1; - dict->head.root = 0; - dict->head.freelist = 0; dict->head.page_size = page_size; - dict->head.compact_flag = compact_flag; - - /* create header with information (page 0) */ - if (rw) - dict_bf_newp (dict->dbf, 0, &head_buf, page_size); + dict->head.compact_flag = compact_flag; + dict_clean(dict); } else /* header was there, check magic and page size */ { - memcpy (&dict->head, head_buf, sizeof(dict->head)); - if (strcmp (dict->head.magic_str, DICT_MAGIC)) + 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", - name, dict->head.page_size, page_size); + yaz_log(YLOG_WARN, "Page size for existing dict %s is %d. Current is %d", + name, dict->head.page_size, page_size); } } if (dict->head.compact_flag) @@ -89,17 +105,42 @@ Dict dict_open (BFiles bfs, const char *name, int cache, int rw, return dict; } -int dict_strcmp (const Dict_char *s1, const Dict_char *s2) +int dict_strcmp(const Dict_char *s1, const Dict_char *s2) { - return strcmp ((const char *) s1, (const char *) s2); + return strcmp((const char *) s1, (const char *) s2); } -int dict_strncmp (const Dict_char *s1, const Dict_char *s2, size_t n) +int dict_strncmp(const Dict_char *s1, const Dict_char *s2, size_t n) { - return strncmp ((const char *) s1, (const char *) s2, n); + return strncmp((const char *) s1, (const char *) s2, n); } -int dict_strlen (const Dict_char *s) +int dict_strlen(const Dict_char *s) { return strlen((const char *) s); } + +zint dict_get_no_lookup(Dict dict) +{ + return dict->no_lookup; +} + +zint dict_get_no_insert(Dict dict) +{ + return dict->no_insert; +} + +zint dict_get_no_split(Dict dict) +{ + return dict->no_split; +} + +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +