X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamb%2Fisamb.c;h=343e5e3794e18de0d20a4e6edac4a01625db3c30;hb=1dec188ccbdafb0ec7b7c98857d701a7b77d46a1;hp=ff09070a35793421e76fdf13fb62bc9b1bcee5ec;hpb=cbc198ddb6b75785106347a61513b003b52dc665;p=idzebra-moved-to-github.git

diff --git a/isamb/isamb.c b/isamb/isamb.c
index ff09070..343e5e3 100644
--- a/isamb/isamb.c
+++ b/isamb/isamb.c
@@ -2,7 +2,7 @@
  *  Copyright (c) 2000-2002, Index Data.
  *  See the file LICENSE for details.
  *
- *  $Id: isamb.c,v 1.14 2002-05-06 17:45:21 adam Exp $
+ *  $Id: isamb.c,v 1.17 2002-06-19 10:29:17 adam Exp $
  */
 #include <yaz/xmalloc.h>
 #include <yaz/log.h>
@@ -74,12 +74,12 @@ void decode_ptr (char **src, int *pos)
 ISAMB isamb_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method)
 {
     ISAMB isamb = xmalloc (sizeof(*isamb));
-    int i, b_size = 64;
+    int i, b_size = 32;
 
     isamb->bfs = bfs;
     isamb->method = (ISAMC_M) xmalloc (sizeof(*method));
     memcpy (isamb->method, method, sizeof(*method));
-    isamb->no_cat = 3;
+    isamb->no_cat = 4;
 
     isamb->file = xmalloc (sizeof(*isamb->file) * isamb->no_cat);
     for (i = 0; i<isamb->no_cat; i++)
@@ -203,7 +203,7 @@ int insert_sub (ISAMB b, struct ISAMB_block **p,
 int insert_int (ISAMB b, struct ISAMB_block *p, void *lookahead_item,
                 int *mode,
                 ISAMC_I stream, struct ISAMB_block **sp,
-                void *split_item, int *split_size)
+                void *split_item, int *split_size, void *last_max_item)
 {
     char *startp = p->bytes;
     char *src = startp;
@@ -240,7 +240,7 @@ int insert_int (ISAMB b, struct ISAMB_block *p, void *lookahead_item,
         sub_p1 = open_block (b, pos);
         assert (sub_p1);
         more = insert_sub (b, &sub_p1, lookahead_item, mode, stream, &sub_p2, 
-                           sub_item, &sub_size, 0);
+                           sub_item, &sub_size, last_max_item);
     }
     if (sub_p2)
     {
@@ -386,10 +386,10 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
                         lookahead_item = 0;
                         more = 0;
                     }
-                    if (max_item &&
+                    if (lookahead_item && max_item &&
                         (*b->method->compare_item)(max_item, lookahead_item) <= 0)
                     {
-			yaz_log (LOG_LOG, "max_item 1");
+                        /* max_item 1 */
                         lookahead_item = 0;
                     }
                     
@@ -428,7 +428,7 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
         if (max_item &&
             (*b->method->compare_item)(max_item, lookahead_item) <= 0)
         {
- 	    yaz_log (LOG_LOG, "max_item 2");
+            /* max_item 2 */
             break;
         }
         if (!*lookahead_mode)
@@ -537,7 +537,7 @@ int insert_sub (ISAMB b, struct ISAMB_block **p, void *new_item,
                             sub_size, max_item);
     else
         return insert_int (b, *p, new_item, mode, stream, sp, sub_item,
-                           sub_size);
+                           sub_size, max_item);
 }
 
 int isamb_merge (ISAMB b, ISAMC_P pos, ISAMC_I stream)