X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsisamb.c;h=62e63d718cc41d2244afb2456581a2cd40bbe4ce;hp=7965ecefc67954770dbcb55e80dda21000c0972c;hb=00d6544408e2de88277e091fb7f8f4dfe3949558;hpb=a8b86c35a39ce9eb5279c46dd99ef7e91b83fb7b diff --git a/rset/rsisamb.c b/rset/rsisamb.c index 7965ece..62e63d7 100644 --- a/rset/rsisamb.c +++ b/rset/rsisamb.c @@ -1,8 +1,5 @@ -/* $Id: rsisamb.c,v 1.14 2004-08-06 12:55:03 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) Index Data Zebra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -15,194 +12,180 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +#if HAVE_CONFIG_H +#include +#endif #include #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 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, TERMID *term); +static int r_read_filter(RSFD rfd, void *buf, TERMID *term); -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_forward(RSET ct, RSFD rfd, void *buf, int *term_index, - int (*cmpfunc)(const void *p1, const void *p2), - const void *untilbuf); -static void r_pos (RSFD rfd, double *current, double *total); -static int r_read (RSFD rfd, void *buf, int *term_index); -static int r_write (RSFD rfd, const void *buf); - -static const struct rset_control control = +static const struct rset_control control = { "isamb", - r_create, + 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, + rset_no_write, }; -const struct rset_control *rset_kind_isamb = &control; +static const struct rset_control control_filter = +{ + "isamb", + r_delete, + rset_get_one_term, + r_open, + r_close, + r_forward, + r_pos, + r_read_filter, + rset_no_write, +}; -struct rset_pp_info { +struct rfd_private { ISAMB_PP pt; - struct rset_pp_info *next; - struct rset_isamb_info *info; - zint *countp; void *buf; }; -struct rset_isamb_info { +struct rset_private { ISAMB is; - ISAMB_P pos; - int key_size; - int (*cmp)(const void *p1, const void *p2); - struct rset_pp_info *ispt_list; + ISAM_P pos; }; -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; - - ct->flags |= RSET_FLAG_VOLATILE; - 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; - ct->no_rset_terms = 1; - ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms)); - ct->rset_terms[0] = pt->rset_term; - return info; -} +static int log_level = 0; +static int log_level_initialized = 0; -RSFD r_open (RSET ct, int flag) +RSET rsisamb_create(NMEM nmem, struct rset_key_control *kcontrol, + int scope, + ISAMB is, ISAM_P pos, TERMID term) { - struct rset_isamb_info *info = (struct rset_isamb_info *) ct->buf; - struct rset_pp_info *ptinfo; - - logf (LOG_DEBUG, "risamb_open"); - if (flag & RSETF_WRITE) + RSET rnew = rset_create_base( + kcontrol->filter_func ? &control_filter : &control, + nmem, kcontrol, scope, term, 0, 0); + struct rset_private *info; + assert(pos); + if (!log_level_initialized) { - logf (LOG_FATAL, "ISAMB set type is read-only"); - return NULL; + log_level = yaz_log_module_level("rsisamb"); + log_level_initialized = 1; } - ptinfo = (struct rset_pp_info *) xmalloc (sizeof(*ptinfo)); - ptinfo->next = info->ispt_list; - info->ispt_list = ptinfo; - ptinfo->pt = isamb_pp_open (info->is, info->pos); - ptinfo->info = info; - if (ct->rset_terms[0]->nn < 0) - ct->rset_terms[0]->nn = isamb_pp_num (ptinfo->pt); - ct->rset_terms[0]->count = 0; - ptinfo->countp = &ct->rset_terms[0]->count; - ptinfo->buf = xmalloc (info->key_size); - return ptinfo; + info = (struct rset_private *) nmem_malloc(rnew->nmem, sizeof(*info)); + info->is = is; + info->pos = pos; + rnew->priv = info; + yaz_log(log_level, "rsisamb_create"); + return rnew; } -static void r_close (RSFD rfd) +static void r_delete(RSET ct) { - 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) - { - xfree ((*ptinfop)->buf); - isamb_pp_close ((*ptinfop)->pt); - *ptinfop = (*ptinfop)->next; - xfree (rfd); - return; - } - logf (LOG_FATAL, "r_close but no rfd match!"); - assert (0); + yaz_log(log_level, "rsisamb_delete"); } -static void r_delete (RSET ct) +RSFD r_open(RSET ct, int flag) { - struct rset_isamb_info *info = (struct rset_isamb_info *) ct->buf; + struct rset_private *info = (struct rset_private *) ct->priv; + RSFD rfd; + struct rfd_private *ptinfo; - logf (LOG_DEBUG, "rsisamb_delete"); - assert (info->ispt_list == NULL); - rset_term_destroy (ct->rset_terms[0]); - xfree (ct->rset_terms); - xfree (info); + if (flag & RSETF_WRITE) + { + yaz_log(YLOG_FATAL, "ISAMB set type is read-only"); + return NULL; + } + rfd = rfd_create_base(ct); + if (rfd->priv) + ptinfo = (struct rfd_private *) (rfd->priv); + else { + ptinfo = (struct rfd_private *) nmem_malloc(ct->nmem,sizeof(*ptinfo)); + ptinfo->buf = nmem_malloc(ct->nmem,ct->keycontrol->key_size); + rfd->priv = ptinfo; + } + ptinfo->pt = isamb_pp_open(info->is, info->pos, ct->scope ); + yaz_log(log_level, "rsisamb_open"); + return rfd; } -static void r_rewind (RSFD rfd) -{ - logf (LOG_DEBUG, "rsisamb_rewind"); - abort (); +static void r_close(RSFD rfd) +{ + struct rfd_private *ptinfo = (struct rfd_private *)(rfd->priv); + isamb_pp_close (ptinfo->pt); + yaz_log(log_level, "rsisamb_close"); } -static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index, - int (*cmpfunc)(const void *p1, const void *p2), - 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; +static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf) +{ + struct rfd_private *pinfo = (struct rfd_private *)(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) +static void r_pos(RSFD rfd, double *current, double *total) { - struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd; + struct rfd_private *pinfo = (struct rfd_private *)(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, int *term_index) +static int r_read(RSFD rfd, void *buf, TERMID *term) { - struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd; - int r; - *term_index = 0; + struct rfd_private *pinfo = (struct rfd_private *)(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; +} - r = isamb_pp_read(pinfo->pt, buf); - if (r > 0) +static int r_read_filter(RSFD rfd, void *buf, TERMID *term) +{ + struct rfd_private *pinfo = (struct rfd_private *)rfd->priv; + const struct rset_key_control *kctrl = rfd->rset->keycontrol; + int rc; + while((rc = isamb_pp_read(pinfo->pt, buf))) { - if (*pinfo->countp == 0 || (*pinfo->info->cmp)(buf, pinfo->buf) > 1) - { - memcpy (pinfo->buf, buf, pinfo->info->key_size); - (*pinfo->countp)++; - } + int incl = (*kctrl->filter_func)(buf, kctrl->filter_data); + if (incl) + break; } - return r; + if (rc && term) + *term = rfd->rset->term; + yaz_log(log_level, "isamb.r_read_filter"); + return rc; } -static int r_write (RSFD rfd, const void *buf) -{ - logf (LOG_FATAL, "ISAMB set type is read-only"); - return -1; -} +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +