X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=rset%2Frsm_or.c;h=8f5ea3355ebf7dffb3a04f66a2bd46907ece6da4;hb=3335cd5f7e7af06ac6ed943859c473e092d559a1;hp=0e4cd986327f4ab1f06ce04c80d988b52dc5ef02;hpb=e6b40b4f140e8f7348fff1f7be78ac78946421ff;p=idzebra-moved-to-github.git

diff --git a/rset/rsm_or.c b/rset/rsm_or.c
index 0e4cd98..8f5ea33 100644
--- a/rset/rsm_or.c
+++ b/rset/rsm_or.c
@@ -1,4 +1,4 @@
-/* $Id: rsm_or.c,v 1.15 2004-08-03 12:15:45 heikki Exp $
+/* $Id: rsm_or.c,v 1.19 2004-08-16 16:17:49 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_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,7 @@ struct rset_mor_rfd {
     struct rset_mor_rfd *next;
     struct rset_mor_info *info;
     struct trunc_info *ti;
-    int  *countp;
+    zint *countp;
     char *pbuf;
 };
 
@@ -193,7 +191,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);
@@ -297,12 +295,6 @@ 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)
 {