X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=9448002df830feddf3a7757a6f9e05741a74529c;hb=6ec32a146d639c16e9929435fdbfd8d915e918b3;hp=afdeb54fb6b114aaff7378e685ea696ccc3cac63;hpb=56131846f59919027a4d3c59efb485afb6efb0de;p=idzebra-moved-to-github.git

diff --git a/rset/rstemp.c b/rset/rstemp.c
index afdeb54..9448002 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -1,4 +1,4 @@
-/* $Id: rstemp.c,v 1.48 2004-09-01 15:01:32 heikki Exp $
+/* $Id: rstemp.c,v 1.50 2004-09-30 09:53:05 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
@@ -37,10 +37,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 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_read (RSFD rfd, void *buf);
 static int r_write (RSFD rfd, const void *buf);
 static void r_pos (RSFD rfd, double *current, double  *total);
+static void r_flush (RSFD rfd, int mk);
+static void r_reread (RSFD rfd);
 
 
 static const struct rset_control control = 
@@ -49,7 +50,6 @@ static const struct rset_control control =
     r_delete,
     r_open,
     r_close,
-    r_rewind,
     rset_default_forward,
     r_pos, 
     r_read,
@@ -79,9 +79,10 @@ struct rset_temp_rfd {
 };
 
 RSET rstemp_create( NMEM nmem, const struct key_control *kcontrol,
+                    int scope, 
                     const char *temp_path)
 {
-    RSET rnew=rset_create_base(&control, nmem, kcontrol);
+    RSET rnew=rset_create_base(&control, nmem, kcontrol, scope);
     struct rset_temp_info *info;
    
     info = (struct rset_temp_info *) nmem_malloc(rnew->nmem, sizeof(*info));
@@ -138,8 +139,13 @@ static RSFD r_open (RSET ct, int flag)
         prfd= (struct rset_temp_rfd *) nmem_malloc(ct->nmem, sizeof(*prfd));
         rfd->priv=(void *)prfd;
         prfd->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size);
-    }
-    r_rewind (rfd);
+    } else
+        prfd= rfd->priv;
+    r_flush (rfd, 0);
+    prfd->pos_cur = 0;
+    info->pos_buf = 0;
+    r_reread (rfd);
+    prfd->cur=0;
     return rfd;
 }
 
@@ -265,16 +271,6 @@ static void r_reread (RSFD rfd)
         info->pos_border = info->pos_end;
 }
 
-static void r_rewind (RSFD rfd)
-{
-    struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) (rfd->priv);  
-    struct rset_temp_info *info = (struct rset_temp_info *)(rfd->rset->priv);
-    r_flush (rfd, 0);
-    mrfd->pos_cur = 0;
-    info->pos_buf = 0;
-    r_reread (rfd);
-    mrfd->cur=0;
-}
 
 static int r_read (RSFD rfd, void *buf)
 {