-/* $Id: key_block.c,v 1.4 2006-11-21 22:17:49 adam Exp $
- Copyright (C) 1995-2006
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2010 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
char buf[ENCODE_BUFLEN];
};
-static int log_level = 0;
-
#define USE_SHELLSORT 0
#if USE_SHELLSORT
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;
+ 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 */
{
zebra_key_block_t p = xmalloc(sizeof(*p));
+#if YAZ_POSIX_THREADS
+ /* we'll be making two memory areas so cut in half */
+ if (use_threads)
+ mem = mem / 2;
+#endif
p->key_buf = (char**) xmalloc (mem);
p->ptr_top = mem/sizeof(char*);
p->ptr_i = 0;
p->alt_buf = (char**) xmalloc (mem);
#endif
}
- yaz_log(YLOG_LOG, "key_block_create t=%d", p->use_threads);
+ yaz_log(YLOG_DEBUG, "key_block_create t=%d", p->use_threads);
return p;
}
((char*)p->key_buf)[(p->key_buf_used)++] = cmd;
if (static_rank_enable)
+ {
+ assert(staticrank >= 0);
key_out.mem[j++] = staticrank;
+ }
if (key_in->mem[1]) /* filter specified record ID */
key_out.mem[j++] = key_in->mem[1];
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;
+ if (ptr_i == 0)
+ return ;
+
(p->key_file_no)++;
- yaz_log(YLOG_LOG, "sorting section %d", (p->key_file_no));
- yaz_log(log_level, " sort_buff at %p n=%d",
- key_buf + ptr_top - ptr_i,ptr_i);
+ 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,
yaz_log (YLOG_FATAL|YLOG_ERRNO, "fopen %s", out_fname);
zebra_exit("key_block_flush");
}
- yaz_log(YLOG_LOG, "writing section %d", p->key_file_no);
+ yaz_log(YLOG_DEBUG, "writing section %d", p->key_file_no);
prevcp = cp = (key_buf)[ptr_top - ptr_i];
encode_key_init (&encode_info);
yaz_log (YLOG_FATAL|YLOG_ERRNO, "fclose %s", out_fname);
zebra_exit("key_block_flush");
}
- yaz_log(YLOG_LOG, "finished section %d", p->key_file_no);
+ yaz_log(YLOG_DEBUG, "finished section %d", p->key_file_no);
}
void key_block_flush(zebra_key_block_t p, int is_final)
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab