Bump year. Change Aps->ApS

[idzebra-moved-to-github.git] / dict / open.c

diff --git a/dict/open.c b/dict/open.c
index a4f136a..5f4e69e 100644 (file)
--- a/dict/open.c
+++ b/dict/open.c
@@ -1,94 +1,50 @@
-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: open.c,v $
- * Revision 1.18  2002-05-03 13:47:15  adam
- * make checkergcc happy
- *
- * Revision 1.17  2000/12/05 09:59:10  adam
- * Work on dict_delete_subtree.
- *
- * Revision 1.16  1999/05/26 07:49:13  adam
- * C++ compilation.
- *
- * Revision 1.15  1999/05/15 14:36:37  adam
- * Updated dictionary. Implemented "compression" of dictionary.
- *
- * Revision 1.14  1999/03/09 13:07:06  adam
- * Work on dict_compact routine.
- *
- * Revision 1.13  1999/02/02 14:50:27  adam
- * Updated WIN32 code specific sections. Changed header.
- *
- * Revision 1.12  1997/09/17 12:19:07  adam
- * Zebra version corresponds to YAZ version 1.4.
- * Changed Zebra server so that it doesn't depend on global common_resource.
- *
- * Revision 1.11  1996/10/29 14:00:05  adam
- * Page size given by DICT_DEFAULT_PAGESIZE in dict.h.
- *
- * Revision 1.10  1996/05/24 14:46:04  adam
- * Added dict_grep_cmap function to define user-mapping in grep lookups.
- *
- * Revision 1.9  1996/02/02  13:43:51  adam
- * The public functions simply use char instead of Dict_char to represent
- * search strings. Dict_char is used internally only.
- *
- * Revision 1.8  1995/12/07  11:48:56  adam
- * Insert operation obeys DICT_type = 1 (slack in page).
- * Function dict_open exists if page size or magic aren't right.
- *
- * Revision 1.7  1995/09/04  12:33:32  adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.6  1994/10/05  12:16:52  adam
- * Pagesize is a resource now.
- *
- * 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.
- *
- */
+/* $Id: open.c,v 1.23 2005-01-15 19:38:23 adam Exp $
+   Copyright (C) 1995-2005
+   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.
+*/
+
+
 
 #include <stdlib.h>
 #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 compact_flag, int page_size)
 {
     Dict dict;
     void *head_buf;
-    char resource_str[80];
-    int page_size;
 
     dict = (Dict) xmalloc (sizeof(*dict));
 
     if (cache < 5)
        cache = 5;
-    sprintf (resource_str, "dict.%s.pagesize", name);
 
     dict->grep_cmap = NULL;
     page_size = DICT_DEFAULT_PAGESIZE;
     if (page_size < 2048)
     {
-        logf (LOG_WARN, "Resource %s was too small. Set to 2048",
-              resource_str);
+        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);
@@ -96,7 +52,7 @@ Dict dict_open (BFiles bfs, const char *name, int cache, int rw,
 
     if(!dict->dbf)
     {
-        logf (LOG_WARN, "Cannot open `%s'", name);
+        yaz_log (YLOG_WARN, "Cannot open `%s'", name);
         xfree (dict);
         return NULL;
     }
@@ -119,14 +75,13 @@ Dict dict_open (BFiles bfs, const char *name, int cache, int rw,
        memcpy (&dict->head, head_buf, sizeof(dict->head));
         if (strcmp (dict->head.magic_str, DICT_MAGIC))
         {
-            logf (LOG_WARN, "Bad magic of `%s'", name);
+            yaz_log (YLOG_WARN, "Bad magic of `%s'", name);
             exit (1);
         }
         if (dict->head.page_size != page_size)
         {
-            logf (LOG_WARN, "Resource %s is %d and pagesize of `%s' is %d",
-                  resource_str, page_size, name, dict->head.page_size);
-           return 0;
+            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)