X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsm_or.c;h=dee79551bc196290d8f9b7c2399a948f84bda943;hb=a17786fb6f17c9bc1453900a6775b86e06222424;hp=dd6abd58d0aaf55ec7ca730a078369587b9d2d67;hpb=9949fe7912e81ebf77d345a0581dc31a439bc2b8;p=idzebra-moved-to-github.git

diff --git a/rset/rsm_or.c b/rset/rsm_or.c
index dd6abd5..dee7955 100644
--- a/rset/rsm_or.c
+++ b/rset/rsm_or.c
@@ -1,4 +1,4 @@
-/* $Id: rsm_or.c,v 1.14 2004-01-16 15:27:35 heikki Exp $
+/* $Id: rsm_or.c,v 1.20 2004-08-20 14:44:46 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -29,7 +29,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 
 #include <zebrautl.h>
-#include <isam.h>
 #include <isamc.h>
 #include <rsm_or.h>
 
@@ -38,20 +37,19 @@ static RSFD r_open (RSET ct, int flag);
 static void r_close (RSFD rfd);
 static void r_delete (RSET ct);
 static void r_rewind (RSFD rfd);
-static int r_count (RSET ct);
-static int r_read (RSFD rfd, void *buf, int *term_index);
+static int r_read (RSFD rfd, void *buf);
 static int r_write (RSFD rfd, const void *buf);
 
 static const struct rset_control control = 
 {
-    "multi-or",
+    "m-or (old)",
     r_create,
     r_open,
     r_close,
     r_delete,
     r_rewind,
-    rset_default_forward,
-    r_count,
+    rset_default_forward, /* FIXME */
+    rset_default_pos, /* FIXME */
     r_read,
     r_write,
 };
@@ -63,7 +61,7 @@ struct rset_mor_info {
     int     no_rec;
     int     (*cmp)(const void *p1, const void *p2);
     ISAMC   isc;
-    ISAM_P  *isam_positions;
+    ISAMC_P *isam_positions;
 
     int     no_isam_positions;
     int     no_save_positions;
@@ -90,7 +88,6 @@ struct rset_mor_rfd {
     struct rset_mor_rfd *next;
     struct rset_mor_info *info;
     struct trunc_info *ti;
-    int  *countp;
     char *pbuf;
 };
 
@@ -193,7 +190,7 @@ static void *r_create (RSET ct, const struct rset_control *sel, void *parms)
 
     info->isc = r_parms->isc;
     info->no_isam_positions = r_parms->no_isam_positions;
-    info->isam_positions = (ISAM_P *)
+    info->isam_positions = (ISAMC_P *)
 	xmalloc (sizeof(*info->isam_positions) * info->no_isam_positions);
     memcpy (info->isam_positions, r_parms->isam_positions,
             sizeof(*info->isam_positions) * info->no_isam_positions);
@@ -243,13 +240,7 @@ static RSFD r_open (RSET ct, int flag)
         }
     }
     rfd->position = info->no_save_positions;
-
-    if (ct->no_rset_terms == 1)
-        rfd->countp = &ct->rset_terms[0]->count;
-    else
-        rfd->countp = 0;
-    rfd->pbuf = xmalloc (info->key_size);
-
+    rfd->pbuf = 0;
     r_rewind (rfd);
     return rfd;
 }
@@ -281,15 +272,8 @@ static void r_close (RSFD rfd)
 static void r_delete (RSET ct)
 {
     struct rset_mor_info *info = (struct rset_mor_info *) ct->buf;
-    int i;
-
     assert (info->rfd_list == NULL);
     xfree (info->isam_positions);
-
-    for (i = 0; i<ct->no_rset_terms; i++)
-	rset_term_destroy (ct->rset_terms[i]);
-    xfree (ct->rset_terms);
-
     xfree (info);
 }
 
@@ -297,12 +281,8 @@ static void r_rewind (RSFD rfd)
 {
 }
 
-static int r_count (RSET ct)
-{
-    return 0;
-}
 
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static int r_read (RSFD rfd, void *buf)
 {
     struct rset_mor_rfd *mrfd = (struct rset_mor_rfd *) rfd;
     struct trunc_info *ti = mrfd->ti;
@@ -310,7 +290,6 @@ static int r_read (RSFD rfd, void *buf, int *term_index)
 
     if (!ti->heapnum)
         return 0;
-    *term_index = 0;
     memcpy (buf, ti->heap[ti->ptr[1]], ti->keysize);
     if (((struct rset_mor_rfd *) rfd)->position)
     {
@@ -323,6 +302,7 @@ static int r_read (RSFD rfd, void *buf, int *term_index)
         }
         else
             heap_delete (ti);
+    rfd->pbuf = xmalloc (info->key_size);
         if (mrfd->countp && (
                 *mrfd->countp == 0 || (*ti->cmp)(buf, mrfd->pbuf) > 1))
         {