X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsisamc.c;h=7a72020a5e62167cf336484be2bb7587b231167b;hp=cb90afd19bee8044eae14debdfe194427a87f014;hb=1d5d4f08cb84516d75fcb5e6ed4199b6454cccd6;hpb=999c8d8e4e8e2940188d7dfcc5d1bb0651f7f4a9 diff --git a/rset/rsisamc.c b/rset/rsisamc.c index cb90afd..7a72020 100644 --- a/rset/rsisamc.c +++ b/rset/rsisamc.c @@ -1,8 +1,5 @@ -/* $Id: rsisamc.c,v 1.14 2004-01-29 13:11:01 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) 2004-2013 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,162 +12,141 @@ 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 -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, TERMID *term); 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 = +static const struct rset_control control = { "isamc", - r_create, + r_delete, + rset_get_one_term, r_open, r_close, - r_delete, - r_rewind, - rset_default_forward, - r_count, + 0, /* no forward */ + r_pos, r_read, r_write, }; -const struct rset_control *rset_kind_isamc = &control; - struct rset_pp_info { ISAMC_PP pt; - struct rset_pp_info *next; - struct rset_isamc_info *info; - int *countp; void *buf; }; struct rset_isamc_info { ISAMC is; - ISAMC_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) +static int log_level = 0; +static int log_level_initialized = 0; + +RSET rsisamc_create(NMEM nmem, struct rset_key_control *kcontrol, + int scope, + ISAMC is, ISAM_P pos, TERMID term) { - rset_isamc_parms *pt = (rset_isamc_parms *) parms; + RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term, 0, 0); struct rset_isamc_info *info; + if (!log_level_initialized) + { + log_level = yaz_log_module_level("rsisamc"); + log_level_initialized = 1; + } + info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem, sizeof(*info)); + info->is = is; + info->pos = pos; + rnew->priv = info; + yaz_log(log_level, "create: term=%p", term); + return rnew; +} - ct->flags |= RSET_FLAG_VOLATILE; - info = (struct rset_isamc_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 void r_delete (RSET ct) +{ + yaz_log(log_level, "rsisamc_delete"); } + RSFD r_open (RSET ct, int flag) { - struct rset_isamc_info *info = (struct rset_isamc_info *) ct->buf; + struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv; + RSFD rfd; struct rset_pp_info *ptinfo; - logf (LOG_DEBUG, "risamc_open"); + yaz_log(log_level, "risamc_open"); if (flag & RSETF_WRITE) { - logf (LOG_FATAL, "ISAMC set type is read-only"); - return NULL; + yaz_log(YLOG_FATAL, "ISAMC set type is read-only"); + return NULL; + } + 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)); + rfd->priv = ptinfo; + ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size); } - ptinfo = (struct rset_pp_info *) xmalloc (sizeof(*ptinfo)); - ptinfo->next = info->ispt_list; - info->ispt_list = ptinfo; - ptinfo->pt = isc_pp_open (info->is, info->pos); - ptinfo->info = info; - if (ct->rset_terms[0]->nn < 0) - ct->rset_terms[0]->nn = isc_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; + ptinfo->pt = isamc_pp_open(info->is, info->pos); + return rfd; } static void r_close (RSFD rfd) { - struct rset_isamc_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); - isc_pp_close ((*ptinfop)->pt); - *ptinfop = (*ptinfop)->next; - xfree (rfd); - return; - } - logf (LOG_FATAL, "r_close but no rfd match!"); - assert (0); -} + struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv); -static void r_delete (RSET ct) -{ - struct rset_isamc_info *info = (struct rset_isamc_info *) ct->buf; - - logf (LOG_DEBUG, "rsisamc_delete"); - assert (info->ispt_list == NULL); - rset_term_destroy (ct->rset_terms[0]); - xfree (ct->rset_terms); - xfree (info); + isamc_pp_close(p->pt); } -static void r_rewind (RSFD rfd) -{ - logf (LOG_DEBUG, "rsisamc_rewind"); - abort (); -} -static int r_count (RSET ct) +static int r_read (RSFD rfd, void *buf, TERMID *term) { - return 0; -} - -static int r_read (RSFD rfd, void *buf, int *term_index) -{ - struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd; + struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv); int r; - *term_index = 0; - r = isc_pp_read(pinfo->pt, buf); - if (r > 0) - { - if (*pinfo->countp == 0 || (*pinfo->info->cmp)(buf, pinfo->buf) > 1) - { - memcpy (pinfo->buf, buf, pinfo->info->key_size); - (*pinfo->countp)++; - } - } + r = isamc_pp_read(p->pt, buf); + if (term) + *term = rfd->rset->term; + yaz_log(log_level, "isamc.r_read"); return r; } static int r_write (RSFD rfd, const void *buf) { - logf (LOG_FATAL, "ISAMC set type is read-only"); + yaz_log(YLOG_FATAL, "ISAMC set type is read-only"); return -1; } + +static void r_pos (RSFD rfd, double *current, double *total) +{ + *current = -1; /* sorry, not implemented yet */ + *total = -1; +} + + + +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +