X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsisams.c;h=7236fc203d7e784175a1808d2b9c12ec579120e0;hp=0ad55d52db68d89e8834149d2f8e3a7b06149167;hb=3bb2fd863b1664f1ff71dadb540313f301ca234f;hpb=b4470de12aa07f21f5394c19af0d21b196087225 diff --git a/rset/rsisams.c b/rset/rsisams.c index 0ad55d5..7236fc2 100644 --- a/rset/rsisams.c +++ b/rset/rsisams.c @@ -1,8 +1,5 @@ -/* $Id: rsisams.c,v 1.9 2004-08-23 12:38:53 heikki Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 - Index Data Aps - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 1994-2011 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,125 +12,126 @@ 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 -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_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 void r_pos (RSFD rfd, double *current, double *total); static const struct rset_control control = { "isams", - r_create, + r_delete, + rset_get_one_term, r_open, r_close, - r_delete, - r_rewind, - rset_default_forward, - rset_default_pos, + 0, /* no forward */ + r_pos, r_read, r_write, }; -const struct rset_control *rset_kind_isams = &control; - -struct rset_pp_info { +struct rfd_private { ISAMS_PP pt; - struct rset_pp_info *next; - struct rset_isams_info *info; }; -struct rset_isams_info { +struct rset_private { ISAMS is; - ISAMS_P pos; - struct rset_pp_info *ispt_list; + ISAM_P pos; }; -static void *r_create(RSET ct, const struct rset_control *sel, void *parms) + +RSET rsisams_create(NMEM nmem, struct rset_key_control *kcontrol, + int scope, + ISAMS is, ISAM_P pos, TERMID term) +{ + RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term, 0, 0); + struct rset_private *info; + info = (struct rset_private *) nmem_malloc(rnew->nmem, sizeof(*info)); + rnew->priv = info; + info->is = is; + info->pos = pos; + return rnew; +} + +static void r_delete (RSET ct) { - rset_isams_parms *pt = (struct rset_isams_parms *) parms; - struct rset_isams_info *info; - - info = (struct rset_isams_info *) xmalloc (sizeof(*info)); - info->is = pt->is; - info->pos = pt->pos; - info->ispt_list = NULL; - return info; + yaz_log (YLOG_DEBUG, "rsisams_delete"); } RSFD r_open (RSET ct, int flag) { - struct rset_isams_info *info = (struct rset_isams_info *) ct->buf; - struct rset_pp_info *ptinfo; + struct rset_private *info = (struct rset_private *) ct->priv; + RSFD rfd; + struct rfd_private *ptinfo; - logf (LOG_DEBUG, "risams_open"); + yaz_log (YLOG_DEBUG, "risams_open"); if (flag & RSETF_WRITE) { - logf (LOG_FATAL, "ISAMS set type is read-only"); + yaz_log (YLOG_FATAL, "ISAMS set type is read-only"); return NULL; } - ptinfo = (struct rset_pp_info *) xmalloc (sizeof(*ptinfo)); - ptinfo->next = info->ispt_list; - info->ispt_list = ptinfo; + 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)); + rfd->priv = ptinfo; + } ptinfo->pt = isams_pp_open (info->is, info->pos); - ptinfo->info = info; - return ptinfo; + return rfd; } static void r_close (RSFD rfd) { - struct rset_isams_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) - { - isams_pp_close ((*ptinfop)->pt); - *ptinfop = (*ptinfop)->next; - xfree (rfd); - return; - } - logf (LOG_FATAL, "r_close but no rfd match!"); - assert (0); -} - -static void r_delete (RSET ct) -{ - struct rset_isams_info *info = (struct rset_isams_info *) ct->buf; - - logf (LOG_DEBUG, "rsisams_delete"); - assert (info->ispt_list == NULL); - xfree (info); -} + struct rfd_private *ptinfo = (struct rfd_private *)(rfd->priv); -static void r_rewind (RSFD rfd) -{ - logf (LOG_DEBUG, "rsisams_rewind"); - abort (); + isams_pp_close (ptinfo->pt); } -static int r_read (RSFD rfd, void *buf) +static int r_read (RSFD rfd, void *buf, TERMID *term) { - return isams_pp_read( ((struct rset_pp_info*) rfd)->pt, buf); + struct rfd_private *ptinfo = (struct rfd_private *)(rfd->priv); + int rc = isams_pp_read(ptinfo->pt, buf); + if (rc && term) + *term = rfd->rset->term; + return rc; } static int r_write (RSFD rfd, const void *buf) { - logf (LOG_FATAL, "ISAMS set type is read-only"); + yaz_log (YLOG_FATAL, "ISAMS 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 + */ +