X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=rset%2Frstemp.c;h=0a3b5829d98cd77ddf4f3dc6b5dc5135c13ccd67;hb=b4470de12aa07f21f5394c19af0d21b196087225;hp=f3fc8deb07d1a8987353525020d45b0694dc3fd9;hpb=70ba74c9bbf739fbe82d1bc2b0fb64a547c0c9e0;p=idzebra-moved-to-github.git

diff --git a/rset/rstemp.c b/rset/rstemp.c
index f3fc8de..0a3b582 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -1,4 +1,4 @@
-/* $Id: rstemp.c,v 1.38 2004-08-03 14:54:41 heikki Exp $
+/* $Id: rstemp.c,v 1.43 2004-08-20 14:44:46 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
@@ -40,8 +40,9 @@ 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 void r_pos (RSFD rfd, double *current, double  *total);
 
 static const struct rset_control control = 
 {
@@ -52,7 +53,7 @@ static const struct rset_control control =
     r_delete,
     r_rewind,
     rset_default_forward,
-    rset_default_pos,
+    r_pos, 
     r_read,
     r_write,
 };
@@ -69,7 +70,7 @@ struct rset_temp_info {
     size_t  pos_buf;       /* position of first byte in window */
     size_t  pos_border;    /* position of last byte+1 in window */
     int     dirty;         /* window is dirty */
-    int     hits;          /* no of hits */
+    zint     hits;          /* no of hits */
     char   *temp_path;
     int     (*cmp)(const void *p1, const void *p2);
     struct rset_temp_rfd *rfd_list;
@@ -78,9 +79,10 @@ struct rset_temp_info {
 struct rset_temp_rfd {
     struct rset_temp_info *info;
     struct rset_temp_rfd *next;
-    int *countp;
+    zint *countp;
     void *buf;
     size_t  pos_cur;       /* current position in set */
+    zint cur; /* number of the current hit */
 };
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
@@ -97,20 +99,17 @@ static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
     info->pos_end = 0;
     info->pos_buf = 0;
     info->dirty = 0;
-    info->hits = -1;
+    info->hits = 0;
     info->cmp = temp_parms->cmp;
     info->rfd_list = NULL;
 
     if (!temp_parms->temp_path)
-	info->temp_path = NULL;
+        info->temp_path = NULL;
     else
     {
-	info->temp_path = (char *) xmalloc (strlen(temp_parms->temp_path)+1);
-	strcpy (info->temp_path, temp_parms->temp_path);
+        info->temp_path = (char *) xmalloc (strlen(temp_parms->temp_path)+1);
+        strcpy (info->temp_path, temp_parms->temp_path);
     }
-    ct->no_rset_terms = 1;
-    ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
-    ct->rset_terms[0] = temp_parms->rset_term;
 
     return info;
 }
@@ -138,7 +137,6 @@ static RSFD r_open (RSET ct, int flag)
     rfd->info = info;
     r_rewind (rfd);
 
-    rfd->countp = &ct->rset_terms[0]->count;
     *rfd->countp = 0;
     rfd->buf = xmalloc (info->key_size);
 
@@ -188,7 +186,7 @@ static void r_flush (RSFD rfd, int mk)
     if (info->fname && info->fd != -1 && info->dirty)
     {
         size_t count;
-	int r;
+        int r;
         
         if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
         {
@@ -251,9 +249,7 @@ static void r_delete (RSET ct)
         xfree (info->fname);
     }
     if (info->temp_path)
-	xfree (info->temp_path);
-    rset_term_destroy (ct->rset_terms[0]);
-    xfree (ct->rset_terms);
+        xfree (info->temp_path);
     xfree (info);
 }
 
@@ -268,7 +264,7 @@ static void r_reread (RSFD rfd)
     if (info->fname)
     {
         size_t count;
-	int r;
+        int r;
 
         info->pos_border = ((struct rset_temp_rfd *)rfd)->pos_cur +
             info->buf_size;
@@ -305,6 +301,7 @@ static void r_rewind (RSFD rfd)
     ((struct rset_temp_rfd *)rfd)->pos_cur = 0;
     info->pos_buf = 0;
     r_reread (rfd);
+    ((struct rset_temp_rfd *)rfd)->cur=0;
 }
 
 /*
@@ -315,7 +312,7 @@ static int r_count (RSET ct)
     return info->pos_end / info->key_size;
 }
 */
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static int r_read (RSFD rfd, void *buf)
 {
     struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd;
     struct rset_temp_info *info = mrfd->info;
@@ -333,13 +330,13 @@ static int r_read (RSFD rfd, void *buf, int *term_index)
     memcpy (buf, info->buf_mem + (mrfd->pos_cur - info->pos_buf),
             info->key_size);
     mrfd->pos_cur = nc;
-    *term_index = 0;
 
     if (*mrfd->countp == 0 || (*info->cmp)(buf, mrfd->buf) > 1)
     {
         memcpy (mrfd->buf, buf, mrfd->info->key_size);
         (*mrfd->countp)++;
     }
+    mrfd->cur++;
     return 1;
 }
 
@@ -363,5 +360,13 @@ static int r_write (RSFD rfd, const void *buf)
     mrfd->pos_cur = nc;
     if (nc > info->pos_end)
         info->pos_border = info->pos_end = nc;
+    info->hits++;
     return 1;
 }
+
+static void r_pos (RSFD rfd, double  *current, double  *total)
+{
+    struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd;
+    *current=(double) mrfd->cur;
+    *total=(double) mrfd->info->hits;
+}