X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=b9983fa0cc3c1d32b65e34c95de9d2bcefcde267;hb=609cbad0a65e5c684a70e8e01b36bead72e39e35;hp=0df8f16fa7ed49714703730e074016ffd906a072;hpb=1bb217ab477284fd7fee47f19a6e8a780fa2bb50;p=idzebra-moved-to-github.git diff --git a/rset/rstemp.c b/rset/rstemp.c index 0df8f16..b9983fa 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -1,4 +1,4 @@ -/* $Id: rstemp.c,v 1.41 2004-08-06 12:28:23 adam Exp $ +/* $Id: rstemp.c,v 1.45 2004-08-24 14:25:16 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 Index Data Aps @@ -34,20 +34,20 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -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 void r_pos (RSFD rfd, double *current, double *total); +/* FIXME - Use the nmem instead of xmalloc all the way through */ + static const struct rset_control control = { "temp", - r_create, r_open, r_close, r_delete, @@ -79,12 +79,40 @@ struct rset_temp_info { struct rset_temp_rfd { struct rset_temp_info *info; struct rset_temp_rfd *next; - int *countp; void *buf; size_t pos_cur; /* current position in set */ zint cur; /* number of the current hit */ }; +RSET rstemp_create( NMEM nmem, int key_size, + int (*cmp)(const void *p1, const void *p2), + const char *temp_path) +{ + RSET rnew=rset_create_base(&control, nmem); + struct rset_temp_info *info; + + info = (struct rset_temp_info *) nmem_malloc ( rnew->nmem, sizeof(*info)); + info->fd = -1; + info->fname = NULL; + info->key_size = key_size; + info->buf_size = 4096; + info->buf_mem = (char *) nmem_malloc (rnew->nmem, info->buf_size); + info->pos_end = 0; + info->pos_buf = 0; + info->dirty = 0; + info->hits = 0; + info->cmp = cmp; + info->rfd_list = NULL; + + if (!temp_path) + info->temp_path = NULL; + else + info->temp_path = nmem_strdup(rnew->nmem,temp_path); + rnew->priv=info; + return rnew; +} /* rstemp_create */ + +#if 0 static void *r_create(RSET ct, const struct rset_control *sel, void *parms) { rset_temp_parms *temp_parms = (rset_temp_parms *) parms; @@ -104,22 +132,40 @@ static void *r_create(RSET ct, const struct rset_control *sel, void *parms) 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; } +#endif + +static void r_delete (RSET ct) +{ + struct rset_temp_info *info = (struct rset_temp_info*) ct->priv; + + xfree (info->buf_mem); + logf (LOG_DEBUG, "r_delete: set size %ld", (long) info->pos_end); + if (info->fname) + { + logf (LOG_DEBUG, "r_delete: unlink %s", info->fname); + unlink (info->fname); + xfree (info->fname); /* FIXME should be nmem'd, and not freed here */ + } + /* + if (info->temp_path) + xfree (info->temp_path); + xfree (info); + */ /* nmem'd */ +} + static RSFD r_open (RSET ct, int flag) { - struct rset_temp_info *info = (struct rset_temp_info *) ct->buf; + struct rset_temp_info *info = (struct rset_temp_info *) ct->priv; struct rset_temp_rfd *rfd; if (info->fd == -1 && info->fname) @@ -140,8 +186,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); return rfd; @@ -190,7 +234,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) { @@ -238,26 +282,6 @@ static void r_close (RSFD rfd) assert (0); } -static void r_delete (RSET ct) -{ - struct rset_temp_info *info = (struct rset_temp_info*) ct->buf; - - if (info->fname) - unlink (info->fname); - xfree (info->buf_mem); - logf (LOG_DEBUG, "r_delete: set size %ld", (long) info->pos_end); - if (info->fname) - { - logf (LOG_DEBUG, "r_delete: unlink %s", info->fname); - unlink (info->fname); - xfree (info->fname); - } - if (info->temp_path) - xfree (info->temp_path); - rset_term_destroy (ct->rset_terms[0]); - xfree (ct->rset_terms); - xfree (info); -} /* r_reread: read from file to window if file is assocated with set - @@ -270,7 +294,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; @@ -318,7 +342,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; @@ -336,13 +360,6 @@ 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; }