X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fopen.c;h=d31252f61ba005d9850e06f8bb4191770311bd86;hp=e5319b3bf63046ebc0dcd5b8429f89884e8651c2;hb=5d536c8cf5400b1e4da91061cf736a9ab53e5bd1;hpb=1be0464201292e60fc8dcd3b922d9c4c4ac52d41 diff --git a/dict/open.c b/dict/open.c index e5319b3..d31252f 100644 --- a/dict/open.c +++ b/dict/open.c @@ -1,94 +1,146 @@ -/* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: open.c,v $ - * Revision 1.5 1994-09-01 17:49:39 adam - * Removed stupid line. Work on insertion in dictionary. Not finished yet. - * - * Revision 1.4 1994/09/01 17:44:10 adam - * depend include change. - * - * Revision 1.3 1994/08/18 12:40:58 adam - * Some development of dictionary. Not finished at all! - * - * Revision 1.2 1994/08/17 13:32:20 adam - * Use cache in dict - not in bfile. - * - * Revision 1.1 1994/08/16 16:26:49 adam - * Added dict. - * - */ +/* 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" -Dict dict_open (const char *name, int cache, int rw) +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; void *head_buf; - struct Dict_head *dh; - dict = xmalloc (sizeof(*dict)); + dict = (Dict) xmalloc(sizeof(*dict)); - dict->dbf = dict_bf_open (name, DICT_PAGESIZE, cache, rw); + if (cache < 5) + cache = 5; + + dict->grep_cmap = NULL; + page_size = DICT_DEFAULT_PAGESIZE; + if (page_size < 2048) + { + 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->rw = rw; + dict->no_split = 0; + dict->no_insert = 0; + dict->no_lookup = 0; if(!dict->dbf) { - log (LOG_LOG, "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) { - if (rw) - { /* create header with information (page 0) */ - dict_bf_newp (dict->dbf, 0, &head_buf); - dh = (struct Dict_head *) head_buf; - strcpy(dh->magic_str, DICT_MAGIC); - dh->free_list = dh->last = 1; - dh->page_size = DICT_PAGESIZE; - memcpy (&dict->head, dh, sizeof(*dh)); - } - else - { /* no header present, i.e. no dictionary at all */ - dict->head.free_list = dict->head.last = 0; - dict->head.page_size = DICT_PAGESIZE; - } + dict->head.page_size = page_size; + dict->head.compact_flag = compact_flag; + dict_clean(dict); } else /* header was there, check magic and page size */ { - dh = (struct Dict_head *) head_buf; - if (strcmp (dh->magic_str, DICT_MAGIC)) + memcpy(&dict->head, head_buf, sizeof(dict->head)); + if (strcmp(dict->head.magic_str, DICT_MAGIC)) { - log (LOG_LOG, "bad magic of `%s'", name); - dict_bf_close (dict->dbf); - xfree (dict); - return NULL; + yaz_log(YLOG_WARN, "Bad magic of `%s'", name); + dict_bf_close(dict->dbf); + xfree(dict); + return 0; } - if (dh->page_size != DICT_PAGESIZE) + if (dict->head.page_size != page_size) { - log (LOG_LOG, "page size mismatch of `%s'", name); - dict_bf_close (dict->dbf); - xfree (dict); - return NULL; + yaz_log(YLOG_WARN, "Page size for existing dict %s is %d. Current is %d", + name, dict->head.page_size, page_size); } - memcpy (&dict->head, dh, sizeof(*dh)); } + if (dict->head.compact_flag) + dict_bf_compact(dict->dbf); 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 (s1, s2); + return strcmp((const char *) s1, (const char *) s2); } -int dict_strlen (const Dict_char *s) +int dict_strncmp(const Dict_char *s1, const Dict_char *s2, size_t n) { - return strlen(s); + return strncmp((const char *) s1, (const char *) s2, n); } + +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 + */ +