X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkey_block.c;h=19a3a1ad9f530d909407ee44ae2f82faee249c28;hb=c9a42d334f292b889d643cf80f6b330c051a9597;hp=125d47a77dfaeae35e3c3ea58ea3499c585fb195;hpb=89d3a004b7c651fd5673abfc192e1472dc4d4197;p=idzebra-moved-to-github.git diff --git a/index/key_block.c b/index/key_block.c index 125d47a..19a3a1a 100644 --- a/index/key_block.c +++ b/index/key_block.c @@ -1,4 +1,4 @@ -/* $Id: key_block.c,v 1.8 2007-01-15 15:10:16 adam Exp $ +/* $Id: key_block.c,v 1.10 2007-04-07 22:24:12 adam Exp $ Copyright (C) 1995-2007 Index Data ApS @@ -212,7 +212,7 @@ zebra_key_block_t key_block_create(int mem, const char *key_tmp_dir, 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; } @@ -302,15 +302,20 @@ 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, - 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(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, @@ -326,7 +331,7 @@ void key_block_flush_int(zebra_key_block_t p, 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); @@ -351,7 +356,7 @@ void key_block_flush_int(zebra_key_block_t p, 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)