X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamb%2Fisamb.c;h=3437fc11c728676f1c6cce15d55bc8bcb9c7bc41;hb=f026071ff0fbd2df52851b204b0dbcee8b45509d;hp=4302a53113ebaa0c3e909b6cbf701c528ac9a4d0;hpb=2e6e4817f094605bbd3455b95ac5fc69920dcc34;p=idzebra-moved-to-github.git

diff --git a/isamb/isamb.c b/isamb/isamb.c
index 4302a53..3437fc1 100644
--- a/isamb/isamb.c
+++ b/isamb/isamb.c
@@ -1,8 +1,8 @@
 /*
- *  Copyright (c) 1995-1998, Index Data.
+ *  Copyright (c) 2000-2002, Index Data.
  *  See the file LICENSE for details.
  *
- *  $Id: isamb.c,v 1.9 2002-04-23 17:56:54 adam Exp $
+ *  $Id: isamb.c,v 1.13 2002-04-30 19:31:09 adam Exp $
  */
 #include <yaz/xmalloc.h>
 #include <yaz/log.h>
@@ -39,7 +39,7 @@ struct ISAMB_s {
 };
 
 struct ISAMB_block {
-    int pos;
+    ISAMB_P pos;
     int cat;
     int size;
     int leaf;
@@ -52,7 +52,10 @@ struct ISAMB_block {
 
 struct ISAMB_PP_s {
     ISAMB isamb;
+    ISAMB_P pos;
     int level;
+    int total_size;
+    int no_blocks;
     struct ISAMB_block **block;
 };
 
@@ -76,7 +79,7 @@ ISAMB isamb_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method)
     isamb->bfs = bfs;
     isamb->method = (ISAMC_M) xmalloc (sizeof(*method));
     memcpy (isamb->method, method, sizeof(*method));
-    isamb->no_cat = 4;
+    isamb->no_cat = 3;
 
     isamb->file = xmalloc (sizeof(*isamb->file) * isamb->no_cat);
     for (i = 0; i<isamb->no_cat; i++)
@@ -88,7 +91,7 @@ ISAMB isamb_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method)
         isamb->file[i].head.block_max = b_size - ISAMB_DATA_OFFSET;
         b_size = b_size * 4;
         isamb->file[i].head_dirty = 0;
-        sprintf (fname, "%s-%d", name, i);
+        sprintf (fname, "%s%c", name, i+'A');
         isamb->file[i].bf =
             bf_open (bfs, fname, isamb->file[i].head.block_size, writeflag);
     
@@ -183,13 +186,14 @@ void close_block (ISAMB b, struct ISAMB_block *p)
 }
 
 int insert_sub (ISAMB b, struct ISAMB_block **p,
-                void *new_item,
+                void *new_item, int *mode,
                 ISAMC_I stream,
                 struct ISAMB_block **sp,
                 void *sub_item, int *sub_size,
                 void *max_item);
 
 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)
 {
@@ -215,7 +219,8 @@ 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, stream, &sub_p2, 
+            more = insert_sub (b, &sub_p1, lookahead_item, mode,
+                               stream, &sub_p2, 
                                sub_item, &sub_size, src);
             break;
         }
@@ -226,7 +231,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, stream, &sub_p2, 
+        more = insert_sub (b, &sub_p1, lookahead_item, mode, stream, &sub_p2, 
                            sub_item, &sub_size, 0);
     }
     if (sub_p2)
@@ -294,7 +299,7 @@ int insert_int (ISAMB b, struct ISAMB_block *p, void *lookahead_item,
 
 
 int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
-                 ISAMC_I stream, struct ISAMB_block **sp2,
+                 int *lookahead_mode, ISAMC_I stream, struct ISAMB_block **sp2,
                  void *sub_item, int *sub_size,
                  void *max_item)
 {
@@ -326,17 +331,23 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
             char *dst_item = 0;
             char *dst_0 = dst;
             char *lookahead_next;
-            int lookahead_mode;
             int d = -1;
             
             if (lookahead_item)
                 d = (*b->method->compare_item)(file_item_buf, lookahead_item);
             
-            if (d > 0)  
+            if (d > 0)
+            {
                 dst_item = lookahead_item;
+                assert (*lookahead_mode);
+            }
             else
                 dst_item = file_item_buf;
-            if (!half1 && dst > cut)   
+            if (!*lookahead_mode && d == 0)
+            {
+                p->dirty = 1;
+            }
+            else if (!half1 && dst > cut)
             {
                 char *dst_item_0 = dst_item;
                 half1 = dst; /* candidate for splitting */
@@ -362,7 +373,7 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
                     lookahead_next = lookahead_item;
                     if (!(*stream->read_item)(stream->clientData,
                                               &lookahead_next,
-                                              &lookahead_mode))
+                                              lookahead_mode))
                     {
                         lookahead_item = 0;
                         more = 0;
@@ -381,7 +392,7 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
             {
                 lookahead_next = lookahead_item;
                 if (!(*stream->read_item)(stream->clientData,
-                                          &lookahead_next, &lookahead_mode))
+                                          &lookahead_next, lookahead_mode))
                 {
                     lookahead_item = 0;
                     more = 0;
@@ -403,7 +414,6 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
     maxp = dst_buf + b->file[b->no_cat-1].head.block_max + quater;
     while (lookahead_item)
     {
-        int lookahead_mode;
         char *dst_item = lookahead_item;
         char *dst_0 = dst;
         
@@ -413,7 +423,12 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
  	    yaz_log (LOG_LOG, "max_item 2");
             break;
         }
-        if (!half1 && dst > cut)   
+        if (!*lookahead_mode)
+        {
+            yaz_log (LOG_WARN, "Inconsistent register (2)");
+            abort();
+        }
+        else if (!half1 && dst > cut)   
         {
             char *dst_item_0 = dst_item;
             half1 = dst; /* candidate for splitting */
@@ -437,7 +452,7 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
             p->dirty = 1;
         dst_item = lookahead_item;
         if (!(*stream->read_item)(stream->clientData, &dst_item,
-                                  &lookahead_mode))
+                                  lookahead_mode))
         {
             lookahead_item = 0;
             more = 0;
@@ -503,16 +518,18 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
 }
 
 int insert_sub (ISAMB b, struct ISAMB_block **p, void *new_item,
+                int *mode,
                 ISAMC_I stream,
                 struct ISAMB_block **sp,
                 void *sub_item, int *sub_size,
                 void *max_item)
 {
     if (!*p || (*p)->leaf)
-        return insert_leaf (b, p, new_item, stream, sp, sub_item, sub_size, 
-                            max_item);
+        return insert_leaf (b, p, new_item, mode, stream, sp, sub_item, 
+                            sub_size, max_item);
     else
-        return insert_int (b, *p, new_item, stream, sp, sub_item, sub_size);
+        return insert_int (b, *p, new_item, mode, stream, sp, sub_item,
+                           sub_size);
 }
 
 int isamb_merge (ISAMB b, ISAMC_P pos, ISAMC_I stream)
@@ -532,7 +549,7 @@ int isamb_merge (ISAMB b, ISAMC_P pos, ISAMC_I stream)
         
         if (pos)
             p = open_block (b, pos);
-        more = insert_sub (b, &p, item_buf, stream, &sp,
+        more = insert_sub (b, &p, item_buf, &i_mode, stream, &sp,
                             sub_item, &sub_size, 0);
         if (sp)
         {    /* increase level of tree by one */
@@ -558,21 +575,27 @@ int isamb_merge (ISAMB b, ISAMC_P pos, ISAMC_I stream)
     return pos;
 }
 
-ISAMB_PP isamb_pp_open (ISAMB isamb, ISAMB_P pos)
+ISAMB_PP isamb_pp_open_x (ISAMB isamb, ISAMB_P pos, int *level)
 {
     ISAMB_PP pp = xmalloc (sizeof(*pp));
 
     pp->isamb = isamb;
     pp->block = xmalloc (10 * sizeof(*pp->block));
 
+    pp->pos = pos;
     pp->level = 0;
+    pp->total_size = 0;
+    pp->no_blocks = 0;
     while (1)
     {
         struct ISAMB_block *p = open_block (isamb, pos);
         char *src = p->bytes + p->offset;
         pp->block[pp->level] = p;
 
-        if (p->bytes[0]) /* leaf */
+        pp->total_size += p->size;
+        pp->no_blocks++;
+
+        if (p->leaf)
             break;
 
         decode_ptr (&src, &pos);
@@ -580,20 +603,43 @@ ISAMB_PP isamb_pp_open (ISAMB isamb, ISAMB_P pos)
         pp->level++;
     }
     pp->block[pp->level+1] = 0;
+    if (level)
+        *level = pp->level;
     return pp;
 }
 
-void isamb_pp_close (ISAMB_PP pp)
+ISAMB_PP isamb_pp_open (ISAMB isamb, ISAMB_P pos)
+{
+    return isamb_pp_open_x (isamb, pos, 0);
+}
+
+void isamb_pp_close_x (ISAMB_PP pp, int *size, int *blocks)
 {
     int i;
     if (!pp)
         return;
+    if (size)
+        *size = pp->total_size;
+    if (blocks)
+        *blocks = pp->no_blocks;
     for (i = 0; i <= pp->level; i++)
         close_block (pp->isamb, pp->block[i]);
     xfree (pp->block);
     xfree (pp);
 }
 
+int isamb_block_info (ISAMB isamb, int cat)
+{
+    if (cat >= 0 && cat < isamb->no_cat)
+        return isamb->file[cat].head.block_size;
+    return -1;
+}
+
+void isamb_pp_close (ISAMB_PP pp)
+{
+    return isamb_pp_close_x (pp, 0, 0);
+}
+
 int isamb_pp_read (ISAMB_PP pp, void *buf)
 {
     char *dst = buf;
@@ -613,7 +659,7 @@ int isamb_pp_read (ISAMB_PP pp, void *buf)
             pp->block[pp->level] = 0;
             (pp->level)--;
             p = pp->block[pp->level];
-            assert (p->bytes[0] == 0);  /* must be int */
+            assert (!p->leaf);  /* must be int */
         }
         src = p->bytes + p->offset;
         
@@ -628,6 +674,9 @@ int isamb_pp_read (ISAMB_PP pp, void *buf)
         while (1)
         {
             pp->block[pp->level] = p = open_block (pp->isamb, pos);
+
+            pp->total_size += p->size;
+            pp->no_blocks++;
             
             if (p->leaf) /* leaf */
             {
@@ -640,7 +689,7 @@ int isamb_pp_read (ISAMB_PP pp, void *buf)
         }
     }
     assert (p->offset < p->size);
-    assert (p->bytes[0]);
+    assert (p->leaf);
     src = p->bytes + p->offset;
     (*pp->isamb->method->code_item)(ISAMC_DECODE, p->decodeClientData,
                                     &dst, &src);