X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=c7fb5307c3c957387b0390fa25e1b8ed86299fe8;hb=1cc0116831e49bf70538639a8fc9b08b9524c683;hp=42b6c526a9c5207239eaaf61c6e57d5b55979f02;hpb=3c5f6226f97612c0d6ac40591f600587c5ffa858;p=idzebra-moved-to-github.git diff --git a/rset/rsisamc.c b/rset/rsisamc.c index 42b6c52..c7fb530 100644 --- a/rset/rsisamc.c +++ b/rset/rsisamc.c @@ -1,54 +1,51 @@ -/* - * Copyright (C) 1994-1999, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: rsisamc.c,v $ - * Revision 1.6 1999-02-02 14:51:35 adam - * Updated WIN32 code specific sections. Changed header. - * - * Revision 1.5 1998/03/05 08:36:28 adam - * New result set model. - * - * Revision 1.4 1997/12/18 10:54:25 adam - * New method result set method rs_hits that returns the number of - * hits in result-set (if known). The ranked result set returns real - * number of hits but only when not combined with other operands. - * - * Revision 1.3 1997/10/31 12:37:01 adam - * Code calls xfree() instead of free(). - * - * Revision 1.2 1996/11/08 11:15:57 adam - * Compressed isam fully supported. - * - * Revision 1.1 1996/10/29 13:41:48 adam - * First use of isamc. - * - */ +/* $Id: rsisamc.c,v 1.25 2004-09-09 10:08:06 heikki Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 + Index Data Aps + +This file is part of the Zebra server. + +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 +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +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. +*/ + + + #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); 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 = { "isamc", - r_create, + r_delete, r_open, r_close, - r_delete, r_rewind, - r_count, + rset_default_forward, + r_pos, r_read, r_write, }; @@ -57,96 +54,75 @@ 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; + void *buf; }; struct rset_isamc_info { ISAMC is; ISAMC_P pos; - struct rset_pp_info *ispt_list; }; -static void *r_create(RSET ct, const struct rset_control *sel, void *parms) +RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol, int scope, + ISAMC is, ISAMC_P pos) { - rset_isamc_parms *pt = parms; + RSET rnew=rset_create_base(&control, nmem, kcontrol, scope); struct rset_isamc_info *info; + info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info)); + info->is=is; + info->pos=pos; + rnew->priv=info; + return rnew; +} - ct->flags |= RSET_FLAG_VOLATILE; - info = xmalloc (sizeof(*info)); - info->is = pt->is; - info->pos = pt->pos; - info->ispt_list = NULL; - ct->no_rset_terms = 1; - ct->rset_terms = xmalloc (sizeof(*ct->rset_terms)); - ct->rset_terms[0] = pt->rset_term; - return info; +static void r_delete (RSET ct) +{ + logf (LOG_DEBUG, "rsisamc_delete"); } + RSFD r_open (RSET ct, int flag) { - struct rset_isamc_info *info = ct->buf; + RSFD rfd; struct rset_pp_info *ptinfo; logf (LOG_DEBUG, "risamc_open"); if (flag & RSETF_WRITE) { - logf (LOG_FATAL, "ISAMC set type is read-only"); - return NULL; + logf (LOG_FATAL, "ISAMC set type is read-only"); + return NULL; } - ptinfo = 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); - return ptinfo; + 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); + } + 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) - { - 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 = 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); + isc_pp_close (p->pt); + rfd_delete_base(rfd); } + static void r_rewind (RSFD rfd) { - logf (LOG_DEBUG, "rsisamc_rewind"); + logf (LOG_FATAL, "rsisamc_rewind"); abort (); } -static int r_count (RSET ct) +static int r_read (RSFD rfd, void *buf) { - return 0; -} - -static int r_read (RSFD rfd, void *buf, int *term_index) -{ - *term_index = 0; - return isc_pp_read( ((struct rset_pp_info*) rfd)->pt, buf); + struct rset_pp_info *p=(struct rset_pp_info *)(rfd->priv); + int r; + r = isc_pp_read(p->pt, buf); + return r; } static int r_write (RSFD rfd, const void *buf) @@ -154,3 +130,10 @@ static int r_write (RSFD rfd, const void *buf) logf (LOG_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; +} +