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
Ignore idzebra.pdf
[idzebra-moved-to-github.git]
/
index
/
key_block.c
diff --git
a/index/key_block.c
b/index/key_block.c
index
9ca9e7d
..
d127d55
100644
(file)
--- a/
index/key_block.c
+++ b/
index/key_block.c
@@
-1,8
+1,5
@@
-/* $Id: key_block.c,v 1.9 2007-02-06 09:33:31 adam Exp $
- Copyright (C) 1995-2007
- Index Data ApS
-
-This file is part of the Zebra server.
+/* 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
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
@@
-20,6
+17,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-99,15
+99,21
@@
static void encode_key_init(struct encode_info *i)
i->decode_handle = iscz1_start();
}
i->decode_handle = iscz1_start();
}
-static void encode_key_write (char *k, struct encode_info *i, FILE *outf)
+static void encode_key_write(const char *k, struct encode_info *i, FILE *outf)
{
struct it_key key;
char *bp = i->buf, *bp0;
const char *src = (char *) &key;
{
struct it_key key;
char *bp = i->buf, *bp0;
const char *src = (char *) &key;
+ size_t klen = strlen(k);
+
+ if (fwrite (k, klen+1, 1, outf) != 1)
+ {
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "fwrite");
+ zebra_exit("encode_key_write");
+ }
+
+ k = k + klen+1;
- /* copy term to output buf */
- while ((*bp++ = *k++))
- ;
/* and copy & align key so we can mangle */
memcpy (&key, k+1, sizeof(struct it_key)); /* *k is insert/delete */
/* and copy & align key so we can mangle */
memcpy (&key, k+1, sizeof(struct it_key)); /* *k is insert/delete */
@@
-302,16
+308,21
@@
void key_block_write(zebra_key_block_t p, zint sysno, struct it_key *key_in,
void key_block_flush_int(zebra_key_block_t p,
void key_block_flush_int(zebra_key_block_t p,
- char **key_buf, size_t ptr_top, size_t ptr_i)
+ char **key_buf, size_t ptr_top, size_t ptr_i)
{
FILE *outf;
char out_fname[200];
char *prevcp, *cp;
struct encode_info encode_info;
{
FILE *outf;
char out_fname[200];
char *prevcp, *cp;
struct encode_info encode_info;
+ if (ptr_i == 0)
+ return ;
+
(p->key_file_no)++;
yaz_log(YLOG_DEBUG, "sorting section %d", (p->key_file_no));
(p->key_file_no)++;
yaz_log(YLOG_DEBUG, "sorting section %d", (p->key_file_no));
+ assert(ptr_i > 0);
+
#if USE_SHELLSORT
shellsort(key_buf + ptr_top - ptr_i, ptr_i,
sizeof(char*), key_qsort_compare);
#if USE_SHELLSORT
shellsort(key_buf + ptr_top - ptr_i, ptr_i,
sizeof(char*), key_qsort_compare);
@@
-405,6
+416,7
@@
int key_block_get_no_files(zebra_key_block_t p)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab