X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Fdrdwr.c;h=23ba730f8a50702a7f2990c199300e355cbc0b05;hb=e150e51a7e20a902e9fd2f11f00811f94f67d529;hp=a77e7a105e2f3f8a94f29f2ed5e354cf603a5544;hpb=df82693c96b0691db2508139dea6fc4a03766193;p=idzebra-moved-to-github.git

diff --git a/dict/drdwr.c b/dict/drdwr.c
index a77e7a1..23ba730 100644
--- a/dict/drdwr.c
+++ b/dict/drdwr.c
@@ -1,6 +1,42 @@
+/*
+ * Copyright (C) 1994-1999, Index Data
+ * All rights reserved.
+ * Sebastian Hammer, Adam Dickmeiss
+ *
+ * $Log: drdwr.c,v $
+ * Revision 1.12  1999-05-18 20:00:33  adam
+ * Minor fix.
+ *
+ * Revision 1.11  1999/05/15 14:36:37  adam
+ * Updated dictionary. Implemented "compression" of dictionary.
+ *
+ * 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.
+ *
+ */
+
 #include <sys/types.h>
 #include <fcntl.h>
+#ifndef WIN32
 #include <unistd.h>
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,7 +44,7 @@
 
 #include <dict.h>
 
-static void pr_lru (Dict_BFile bf)
+void dict_pr_lru (Dict_BFile bf)
 {
     struct Dict_file_block *p;
     for (p=bf->lru_back; p; p = p->lru_next)
@@ -41,7 +77,7 @@ static void release_block (Dict_BFile bf, struct Dict_file_block *p)
     if (p->lru_next)
         p->lru_next->lru_prev = p->lru_prev;
     else
-        bf->lru_back = p->lru_prev;
+        bf->lru_front = p->lru_prev;
 
     /* remove from hash chain */
     *p->h_prev = p->h_next;
@@ -61,7 +97,45 @@ 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, 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
+		    logf (LOG_LOG, "bf_write no=%d offset=%d size=%d",
+			  effective_block, effective_offset,
+			  p->nbytes);
+#endif
+			  
+		}
+		else
+		{
+#if 0
+		    logf (LOG_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
+		    logf (LOG_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);
     }
 }
@@ -121,7 +195,7 @@ static void move_to_front (Dict_BFile bf, struct Dict_file_block *p)
     bf->lru_front = p;
 }
 
-int bf_readp (Dict_BFile bf, int no, void **bufp)
+int dict_bf_readp (Dict_BFile bf, int no, void **bufp)
 {
     struct Dict_file_block *p;
     int i;
@@ -134,7 +208,21 @@ int bf_readp (Dict_BFile bf, int no, void **bufp)
     }
     bf->misses++;
     p = alloc_block (bf, no);
-    i = bf_read (bf->bf, no, 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;
@@ -145,27 +233,28 @@ int bf_readp (Dict_BFile bf, int no, void **bufp)
     return i;
 }
 
-int bf_newp (Dict_BFile bf, 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 (bf, no)))
-        p = alloc_block (bf, no);
+    if (!(p = find_block (dbf, no)))
+        p = alloc_block (dbf, no);
     else
-        move_to_front (bf, p);
+        move_to_front (dbf, p);
     *bufp = p->data;
-    memset (p->data, 0, bf->bf->block_size);
+    memset (p->data, 0, dbf->block_size);
     p->dirty = 1;
+    p->nbytes = nbytes;
 #if 0
     printf ("bf_newp of %d:", no);
-    pr_lru (bf);
+    dict_pr_lru (dbf);
 #endif
     return 1;
 }
 
-int bf_touch (Dict_BFile bf, int no)
+int dict_bf_touch (Dict_BFile dbf, int no)
 {
     struct Dict_file_block *p;
-    if ((p = find_block (bf, no)))
+    if ((p = find_block (dbf, no)))
     {
         p->dirty = 1;
         return 0;