X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamb.c;h=50e9beab587e390fcd6f088c3f72fa96b67e7a86;hb=d195e3229385349f842d2f82b65ad8118d64aec5;hp=c737607f2ce37ddb6361e0ccab023515eee3ba9c;hpb=8d47d759a2e957ada235ab83bf877f2eb0d2ab99;p=idzebra-moved-to-github.git diff --git a/rset/rsisamb.c b/rset/rsisamb.c index c737607..50e9bea 100644 --- a/rset/rsisamb.c +++ b/rset/rsisamb.c @@ -1,4 +1,4 @@ -/* $Id: rsisamb.c,v 1.18 2004-08-26 11:11:59 heikki Exp $ +/* $Id: rsisamb.c,v 1.28 2004-11-19 10:27:14 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -23,33 +23,26 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#include +#include #include -#include <../index/index.h> /* for log_keydump. Debugging only */ -#ifndef RSET_DEBUG -#define RSET_DEBUG 0 -#endif 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_forward(RSET ct, RSFD rfd, void *buf, - int (*cmpfunc)(const void *p1, const void *p2), - const void *untilbuf); +static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf); static void r_pos (RSFD rfd, double *current, double *total); -static int r_read (RSFD rfd, void *buf); +static int r_read (RSFD rfd, void *buf, TERMID *term); static int r_write (RSFD rfd, const void *buf); static const struct rset_control control = { "isamb", + r_delete, + rset_get_one_term, r_open, r_close, - r_delete, - r_rewind, - r_forward, /* rset_default_forward, */ + r_forward, r_pos, r_read, r_write, @@ -59,154 +52,106 @@ const struct rset_control *rset_kind_isamb = &control; struct rset_pp_info { ISAMB_PP pt; - struct rset_pp_info *next; - struct rset_isamb_info *info; void *buf; }; struct rset_isamb_info { ISAMB is; ISAMB_P pos; - int key_size; - int (*cmp)(const void *p1, const void *p2); - struct rset_pp_info *ispt_list; - struct rset_pp_info *free_list; }; -RSET rsisamb_create( NMEM nmem, int key_size, - int (*cmp)(const void *p1, const void *p2), - ISAMB is, ISAMB_P pos) +static int log_level = 0; +static int log_level_initialized = 0; + +RSET rsisamb_create( NMEM nmem, const struct key_control *kcontrol, int scope, + ISAMB is, ISAMB_P pos, TERMID term) { - RSET rnew=rset_create_base(&control, nmem); + RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term); struct rset_isamb_info *info; + if (!log_level_initialized) + { + log_level = yaz_log_module_level("rsisamb"); + log_level_initialized = 1; + } info = (struct rset_isamb_info *) nmem_malloc(rnew->nmem,sizeof(*info)); - info->key_size = key_size; - info->cmp = cmp; - info->is=is; - info->pos=pos; - info->ispt_list = NULL; - info->free_list = NULL; - rnew->priv=info; + info->is = is; + info->pos = pos; + rnew->priv = info; + yaz_log(log_level,"rsisamb_create"); return rnew; } static void r_delete (RSET ct) { - struct rset_isamb_info *info = (struct rset_isamb_info *) ct->priv; - - logf (LOG_DEBUG, "rsisamb_delete"); - assert (info->ispt_list == NULL); -} - -#if 0 -static void *r_create(RSET ct, const struct rset_control *sel, void *parms) -{ - rset_isamb_parms *pt = (rset_isamb_parms *) parms; - struct rset_isamb_info *info; - - info = (struct rset_isamb_info *) xmalloc (sizeof(*info)); - info->is = pt->is; - info->pos = pt->pos; - info->key_size = pt->key_size; - info->cmp = pt->cmp; - info->ispt_list = NULL; - return info; + yaz_log(log_level, "rsisamb_delete"); } -#endif RSFD r_open (RSET ct, int flag) { struct rset_isamb_info *info = (struct rset_isamb_info *) ct->priv; + RSFD rfd; struct rset_pp_info *ptinfo; - logf (LOG_DEBUG, "risamb_open"); if (flag & RSETF_WRITE) { - logf (LOG_FATAL, "ISAMB set type is read-only"); + yaz_log(YLOG_FATAL, "ISAMB set type is read-only"); return NULL; } - ptinfo = info->free_list; - if (ptinfo) - info->free_list=ptinfo->next; + rfd = rfd_create_base(ct); + if (rfd->priv) + ptinfo = (struct rset_pp_info *) (rfd->priv); else { - ptinfo = (struct rset_pp_info *) nmem_malloc (ct->nmem,sizeof(*ptinfo)); - ptinfo->buf = nmem_malloc (ct->nmem,info->key_size); + ptinfo = (struct rset_pp_info *)nmem_malloc(ct->nmem,sizeof(*ptinfo)); + ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size); + rfd->priv = ptinfo; } - ptinfo->next = info->ispt_list; - info->ispt_list = ptinfo; - ptinfo->pt = isamb_pp_open (info->is, info->pos); - ptinfo->info = info; - return ptinfo; + ptinfo->pt = isamb_pp_open (info->is, info->pos, ct->scope ); + yaz_log(log_level,"rsisamb_open"); + return rfd; } static void r_close (RSFD rfd) { - struct rset_isamb_info *info = ((struct rset_pp_info*) rfd)->info; - struct rset_pp_info **ptinfop; - - for (ptinfop = &info->ispt_list; *ptinfop; ptinfop = &(*ptinfop)->next) - if (*ptinfop == rfd) - { - struct rset_pp_info *tmp=(struct rset_pp_info*) rfd; - isamb_pp_close ((*ptinfop)->pt); - *ptinfop = (*ptinfop)->next; - tmp->next=info->free_list; - info->free_list=tmp; - return; - } - logf (LOG_FATAL, "r_close but no rfd match!"); - assert (0); + struct rset_pp_info *ptinfo = (struct rset_pp_info *)(rfd->priv); + isamb_pp_close (ptinfo->pt); + rfd_delete_base(rfd); + yaz_log(log_level,"rsisamb_close"); } -static void r_rewind (RSFD rfd) -{ - logf (LOG_DEBUG, "rsisamb_rewind"); - abort (); -} - -static int r_forward(RSET ct, RSFD rfd, void *buf, - int (*cmpfunc)(const void *p1, const void *p2), - const void *untilbuf) +static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf) { - int i; - struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd; -#if RSET_DEBUG - logf (LOG_DEBUG, "rset_rsisamb_forward starting '%s' (ct=%p rfd=%p)", - ct->control->desc, ct,rfd); - key_logdump(LOG_DEBUG, untilbuf); - key_logdump(LOG_DEBUG, buf); -#endif - - i=isamb_pp_forward(pinfo->pt, buf, untilbuf); -#if RSET_DEBUG - logf (LOG_DEBUG, "rset_rsisamb_forward returning %d",i); -#endif - return i; + struct rset_pp_info *pinfo = (struct rset_pp_info *)(rfd->priv); + int rc; + rc = isamb_pp_forward(pinfo->pt, buf, untilbuf); + if (rc && term) + *term = rfd->rset->term; + yaz_log(log_level,"rsisamb_forward"); + return rc; } static void r_pos (RSFD rfd, double *current, double *total) { - struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd; + struct rset_pp_info *pinfo = (struct rset_pp_info *)(rfd->priv); assert(rfd); isamb_pp_pos(pinfo->pt, current, total); -#if RSET_DEBUG - logf(LOG_DEBUG,"isamb.r_pos returning %0.1f/%0.1f", + yaz_log(log_level,"isamb.r_pos returning %0.1f/%0.1f", *current, *total); -#endif } -static int r_read (RSFD rfd, void *buf) +static int r_read (RSFD rfd, void *buf, TERMID *term) { - struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd; - int r; - - r = isamb_pp_read(pinfo->pt, buf); - return r; + struct rset_pp_info *pinfo = (struct rset_pp_info *)(rfd->priv); + int rc; + rc = isamb_pp_read(pinfo->pt, buf); + if (rc && term) + *term = rfd->rset->term; + yaz_log(log_level,"isamb.r_read "); + return rc; } static int r_write (RSFD rfd, const void *buf) { - logf (LOG_FATAL, "ISAMB set type is read-only"); + yaz_log(YLOG_FATAL, "ISAMB set type is read-only"); return -1; }