X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fdrdwr.c;h=a77335fbea7a367b10a963450c1a8df1515f0566;hp=a7863044f0b347866b630bb0de45606fe28ce93f;hb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;hpb=3c5f6226f97612c0d6ac40591f600587c5ffa858

diff --git a/dict/drdwr.c b/dict/drdwr.c
index a786304..a77335f 100644
--- a/dict/drdwr.c
+++ b/dict/drdwr.c
@@ -1,30 +1,26 @@
-/*
- * Copyright (C) 1994-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: drdwr.c,v $
- * Revision 1.10  1999-02-02 14:50:21  adam
- * Updated WIN32 code specific sections. Changed header.
- *
- * Revision 1.9  1997/09/09 13:38:01  adam
- * Partial port to WIN95/NT.
- *
- * Revision 1.8  1995/01/24 11:25:11  adam
- * Removed stupid assertion.
- *
- * Revision 1.7  1994/10/05  10:47:15  adam
- * Function pr_lru is non-static now. No warning no more.
- *
- * Revision 1.6  1994/09/06  13:05:14  adam
- * Further development of insertion. Some special cases are
- * not properly handled yet! assert(0) are put here. The
- * binary search in each page definitely reduce usr CPU.
- *
- * Revision 1.5  1994/09/01  17:49:38  adam
- * Removed stupid line. Work on insertion in dictionary. Not finished yet.
- *
- */
+/* $Id: drdwr.c,v 1.16 2005-01-15 19:38:21 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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
+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.
+*/
+
+
 
 #include <sys/types.h>
 #include <fcntl.h>
@@ -36,7 +32,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include <dict.h>
+#include "dict-p.h"
 
 void dict_pr_lru (Dict_BFile bf)
 {
@@ -92,7 +88,43 @@ void dict_bf_flush_blocks (Dict_BFile bf, int no_to_flush)
         p = bf->lru_back;
         if (p->dirty)
         {
-            bf_write (bf->bf, p->no, 0, 0, p->data);
+	    if (!bf->compact_flag)
+		bf_write (bf->bf, p->no, 0, 0, p->data);
+	    else
+	    {
+		int effective_block = p->no / bf->block_size;
+		int effective_offset = p->no -
+		    effective_block * bf->block_size;
+		int remain = bf->block_size - effective_offset;
+
+		if (remain >= p->nbytes)
+		{
+		    bf_write (bf->bf, effective_block, effective_offset,
+			      p->nbytes, p->data);
+#if 0
+		    yaz_log (YLOG_LOG, "bf_write no=%d offset=%d size=%d",
+			  effective_block, effective_offset,
+			  p->nbytes);
+#endif
+			  
+		}
+		else
+		{
+#if 0
+		    yaz_log (YLOG_LOG, "bf_write1 no=%d offset=%d size=%d",
+			  effective_block, effective_offset,
+			  remain);
+#endif
+		    bf_write (bf->bf, effective_block, effective_offset,
+			      remain, p->data);
+#if 0
+		    yaz_log (YLOG_LOG, "bf_write2 no=%d offset=%d size=%d",
+			  effective_block+1, 0, p->nbytes - remain);
+#endif
+		    bf_write (bf->bf, effective_block+1, 0,
+			      p->nbytes - remain, (char*)p->data + remain);
+		}
+	    }
         }
         release_block (bf, p);
     }
@@ -166,7 +198,21 @@ int dict_bf_readp (Dict_BFile bf, int no, void **bufp)
     }
     bf->misses++;
     p = alloc_block (bf, no);
-    i = bf_read (bf->bf, no, 0, 0, p->data);
+
+    if (!bf->compact_flag)
+	i = bf_read (bf->bf, no, 0, 0, p->data);
+    else
+    {
+	int effective_block = no / bf->block_size;
+	int effective_offset = no - effective_block * bf->block_size;
+
+	i = bf_read (bf->bf, effective_block, effective_offset,
+		     bf->block_size - effective_offset, p->data);
+	if (i > 0 && effective_offset > 0)
+	    i = bf_read (bf->bf, effective_block+1, 0, effective_offset,
+			 (char*) p->data + bf->block_size - effective_offset);
+	i = 1;
+    }
     if (i > 0)
     {
         *bufp = p->data;
@@ -177,7 +223,7 @@ int dict_bf_readp (Dict_BFile bf, int no, void **bufp)
     return i;
 }
 
-int dict_bf_newp (Dict_BFile dbf, int no, void **bufp)
+int dict_bf_newp (Dict_BFile dbf, int no, void **bufp, int nbytes)
 {
     struct Dict_file_block *p;
     if (!(p = find_block (dbf, no)))
@@ -187,6 +233,7 @@ int dict_bf_newp (Dict_BFile dbf, int no, void **bufp)
     *bufp = p->data;
     memset (p->data, 0, dbf->block_size);
     p->dirty = 1;
+    p->nbytes = nbytes;
 #if 0
     printf ("bf_newp of %d:", no);
     dict_pr_lru (dbf);