X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frecindex.c;h=25a997ff7d3c315edf7bbe3969d178bc9f83df29;hb=b7942589b21cca1b6d44c7bf9446dcb6a5942953;hp=979d067be1b7977432167e95fd4fbb3f79c2c364;hpb=9167923869bcb07faf7e357c883f070be098c66e;p=idzebra-moved-to-github.git diff --git a/index/recindex.c b/index/recindex.c index 979d067..25a997f 100644 --- a/index/recindex.c +++ b/index/recindex.c @@ -1,10 +1,19 @@ /* - * Copyright (C) 1994-1996, Index Data I/S + * Copyright (C) 1994-1997, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: recindex.c,v $ - * Revision 1.17 1997-02-12 20:39:46 adam + * Revision 1.19 1997-09-17 12:19:16 adam + * Zebra version corresponds to YAZ version 1.4. + * Changed Zebra server so that it doesn't depend on global common_resource. + * + * Revision 1.18 1997/07/15 16:28:42 adam + * Bug fix: storeData didn't work with files with multiple records. + * Bug fix: fixed memory management with records; not really well + * thought through. + * + * Revision 1.17 1997/02/12 20:39:46 adam * Implemented options -f that limits the log to the first * records. * Changed some log messages also. @@ -98,11 +107,11 @@ static void rec_write_head (Records p) static void rec_tmp_expand (Records p, int size, int dst_type) { - if (p->tmp_size < size + 256 || + if (p->tmp_size < size + 2048 || p->tmp_size < p->head.block_size[dst_type]*2) { xfree (p->tmp_buf); - p->tmp_size = size + p->head.block_size[dst_type]*2 + 256; + p->tmp_size = size + p->head.block_size[dst_type]*2 + 2048; p->tmp_buf = xmalloc (p->tmp_size); } } @@ -256,7 +265,7 @@ static void rec_update_single (Records p, Record rec) rec_write_single (p, rec); } -Records rec_open (int rw) +Records rec_open (BFiles bfs, int rw) { Records p; int i, r; @@ -266,7 +275,7 @@ Records rec_open (int rw) p->tmp_size = 1024; p->tmp_buf = xmalloc (p->tmp_size); p->index_fname = "recindex"; - p->index_BFile = bf_open (p->index_fname, 128, rw); + p->index_BFile = bf_open (bfs, p->index_fname, 128, rw); if (p->index_BFile == NULL) { logf (LOG_FATAL|LOG_ERRNO, "open %s", p->index_fname); @@ -316,7 +325,7 @@ Records rec_open (int rw) } for (i = 0; idata_BFile[i] = bf_open (p->data_fname[i], + if (!(p->data_BFile[i] = bf_open (bfs, p->data_fname[i], p->head.block_size[i], rw))) {