-/* $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
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 =
{
r_delete,
r_rewind,
rset_default_forward,
- rset_default_pos,
+ r_pos,
r_read,
r_write,
};
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;
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)
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;
}
rfd->info = info;
r_rewind (rfd);
- rfd->countp = &ct->rset_terms[0]->count;
*rfd->countp = 0;
rfd->buf = xmalloc (info->key_size);
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)
{
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);
}
if (info->fname)
{
size_t count;
- int r;
+ int r;
info->pos_border = ((struct rset_temp_rfd *)rfd)->pos_cur +
info->buf_size;
((struct rset_temp_rfd *)rfd)->pos_cur = 0;
info->pos_buf = 0;
r_reread (rfd);
+ ((struct rset_temp_rfd *)rfd)->cur=0;
}
/*
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;
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;
}
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;
+}