projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
[idzebra-moved-to-github.git]
/
dict
/
dcompact.c
diff --git
a/dict/dcompact.c
b/dict/dcompact.c
index
489e79f
..
46d067b
100644
(file)
--- a/
dict/dcompact.c
+++ b/
dict/dcompact.c
@@
-1,8
+1,5
@@
-/* $Id: dcompact.c,v 1.9 2004-09-09 09:07:12 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2009 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
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
@@
-15,9
+12,9
@@
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
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
+
*/
*/
@@
-27,8
+24,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <string.h>
#include <stdio.h>
#include <string.h>
#include <stdio.h>
-#include <yaz/log.h>
-#include <dict.h>
+#include "dict-p.h"
static void dict_copy_page(Dict dict, char *to_p, char *from_p, int *map)
{
static void dict_copy_page(Dict dict, char *to_p, char *from_p, int *map)
{
@@
-110,7
+106,7
@@
int dict_copy_compact (BFiles bfs, const char *from_name, const char *to_name)
void *buf;
int size;
#if 0
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) +
#endif
dict_bf_readp (dict_from->dbf, i, &buf);
size = ((DICT_size(buf)+sizeof(short)-1)/sizeof(short) +
@@
-119,8
+115,8
@@
int dict_copy_compact (BFiles bfs, const char *from_name, const char *to_name)
no_dir += DICT_nodir(buf);
}
#if 0
no_dir += DICT_nodir(buf);
}
#if 0
- logf (LOG_LOG, "map[%d] = %d", i, map[i]);
- logf (LOG_LOG, "nodir = %d", no_dir);
+ 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];
#endif
dict_to->head.root = map[1];
dict_to->head.last = map[i];
@@
-129,7
+125,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);
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]);
map[i+1] - map[i]);
dict_bf_newp (dict_to->dbf, map[i], &new_p, map[i+1] - map[i]);
@@
-143,3
+139,12
@@
int dict_copy_compact (BFiles bfs, const char *from_name, const char *to_name)
dict_close (dict_to);
return 0;
}
dict_close (dict_to);
return 0;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+