X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=rset%2Frsisams.c;h=0ad55d52db68d89e8834149d2f8e3a7b06149167;hb=9c50a60b4bd5de297f77866fd173c78a10328498;hp=42388c539471769ed50741baca804936f697baa9;hpb=9949fe7912e81ebf77d345a0581dc31a439bc2b8;p=idzebra-moved-to-github.git

diff --git a/rset/rsisams.c b/rset/rsisams.c
index 42388c5..0ad55d5 100644
--- a/rset/rsisams.c
+++ b/rset/rsisams.c
@@ -1,4 +1,4 @@
-/* $Id: rsisams.c,v 1.4 2004-01-16 15:27:35 heikki Exp $
+/* $Id: rsisams.c,v 1.9 2004-08-23 12:38:53 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -24,16 +24,15 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <stdio.h>
 #include <assert.h>
-#include <rsisams.h>
 #include <zebrautl.h>
+#include <rsisams.h>
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
 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 = 
@@ -45,7 +44,7 @@ static const struct rset_control control =
     r_delete,
     r_rewind,
     rset_default_forward,
-    r_count,
+    rset_default_pos,
     r_read,
     r_write,
 };
@@ -69,14 +68,10 @@ static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
     rset_isams_parms *pt = (struct rset_isams_parms *) parms;
     struct rset_isams_info *info;
 
-    ct->flags |= RSET_FLAG_VOLATILE;
     info = (struct rset_isams_info *) xmalloc (sizeof(*info));
     info->is = pt->is;
     info->pos = pt->pos;
     info->ispt_list = NULL;
-    ct->no_rset_terms = 1;
-    ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
-    ct->rset_terms[0] = pt->rset_term;
     return info;
 }
 
@@ -88,16 +83,14 @@ RSFD r_open (RSET ct, int flag)
     logf (LOG_DEBUG, "risams_open");
     if (flag & RSETF_WRITE)
     {
-	logf (LOG_FATAL, "ISAMS set type is read-only");
-	return NULL;
+        logf (LOG_FATAL, "ISAMS set type is read-only");
+        return NULL;
     }
     ptinfo = (struct rset_pp_info *) xmalloc (sizeof(*ptinfo));
     ptinfo->next = info->ispt_list;
     info->ispt_list = ptinfo;
     ptinfo->pt = isams_pp_open (info->is, info->pos);
     ptinfo->info = info;
-    if (ct->rset_terms[0]->nn < 0)
-	ct->rset_terms[0]->nn = isams_pp_num (ptinfo->pt);
     return ptinfo;
 }
 
@@ -124,8 +117,6 @@ static void r_delete (RSET ct)
 
     logf (LOG_DEBUG, "rsisams_delete");
     assert (info->ispt_list == NULL);
-    rset_term_destroy (ct->rset_terms[0]);
-    xfree (ct->rset_terms);
     xfree (info);
 }
 
@@ -135,14 +126,9 @@ static void r_rewind (RSFD rfd)
     abort ();
 }
 
-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)
 {
-    *term_index = 0;
     return isams_pp_read( ((struct rset_pp_info*) rfd)->pt, buf);
 }