Bump year. Change Aps->ApS

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

diff --git a/dict/dcompact.c b/dict/dcompact.c
index 3f8999a..e68e7d2 100644 (file)
--- a/dict/dcompact.c
+++ b/dict/dcompact.c
@@ -1,33 +1,33 @@
-/*
- * Copyright (C) 1994-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: dcompact.c,v $
- * Revision 1.5  1999-05-26 07:49:12  adam
- * C++ compilation.
- *
- * Revision 1.4  1999/05/15 14:36:37  adam
- * Updated dictionary. Implemented "compression" of dictionary.
- *
- * Revision 1.3  1999/05/12 13:08:06  adam
- * First version of ISAMS.
- *
- * Revision 1.2  1999/03/09 16:27:49  adam
- * More work on SDRKit integration.
- *
- * Revision 1.1  1999/03/09 13:07:06  adam
- * Work on dict_compact routine.
- *
- */
+/* $Id: dcompact.c,v 1.13 2005-01-15 19:38:21 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 <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
-#include <log.h>
-#include <dict.h>
+#include "dict-p.h"
 
 static void dict_copy_page(Dict dict, char *to_p, char *from_p, int *map)
 {
@@ -92,13 +92,13 @@ int dict_copy_compact (BFiles bfs, const char *from_name, const char *to_name)
     int no_dir = 0;
     Dict dict_from, dict_to;
     int *map, i;
-    dict_from = dict_open (bfs, from_name, 0, 0, 0);
+    dict_from = dict_open (bfs, from_name, 0, 0, 0, 4096);
     if (!dict_from)
        return -1;
     map = (int *) xmalloc ((dict_from->head.last+1) * sizeof(*map));
     for (i = 0; i <= (int) (dict_from->head.last); i++)
        map[i] = -1;
-    dict_to = dict_open (bfs, to_name, 0, 1, 1);
+    dict_to = dict_open (bfs, to_name, 0, 1, 1, 4096);
     if (!dict_to)
        return -1;
     map[0] = 0;
@@ -109,7 +109,7 @@ int dict_copy_compact (BFiles bfs, const char *from_name, const char *to_name)
        void *buf;
        int size;
 #if 0
-       logf (LOG_LOG, "map[%d] = %d", i, map[i]);
+       yaz_log (YLOG_LOG, "map[%d] = %d", i, map[i]);
 #endif
        dict_bf_readp (dict_from->dbf, i, &buf);
        size = ((DICT_size(buf)+sizeof(short)-1)/sizeof(short) +
@@ -117,8 +117,10 @@ int dict_copy_compact (BFiles bfs, const char *from_name, const char *to_name)
        map[i+1] = map[i] + size;
        no_dir += DICT_nodir(buf);
     }
-    logf (LOG_LOG, "map[%d] = %d", i, map[i]);
-    logf (LOG_LOG, "nodir = %d", no_dir);
+#if 0
+    yaz_log (YLOG_LOG, "map[%d] = %d", i, map[i]);
+    yaz_log (YLOG_LOG, "nodir = %d", no_dir);
+#endif
     dict_to->head.root = map[1];
     dict_to->head.last = map[i];
     for (i = 1; i< (int) (dict_from->head.last); i++)
@@ -126,7 +128,7 @@ int dict_copy_compact (BFiles bfs, const char *from_name, const char *to_name)
        void *old_p, *new_p;
        dict_bf_readp (dict_from->dbf, i, &old_p);
 
-       logf (LOG_LOG, "dict_bf_newp no=%d size=%d", map[i],
+       yaz_log (YLOG_LOG, "dict_bf_newp no=%d size=%d", map[i],
              map[i+1] - map[i]);
         dict_bf_newp (dict_to->dbf, map[i], &new_p, map[i+1] - map[i]);