X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=c7fb5307c3c957387b0390fa25e1b8ed86299fe8;hb=c04a10ad2c24474c9c86a8a1453f6f40e4bc1853;hp=fb429ad6c7dd0d6d3630282050b024a4123d1284;hpb=221024eb6b10e45d6479bb4154dd7de7fca1d477;p=idzebra-moved-to-github.git diff --git a/rset/rsisamc.c b/rset/rsisamc.c index fb429ad..c7fb530 100644 --- a/rset/rsisamc.c +++ b/rset/rsisamc.c @@ -1,149 +1,128 @@ -/* - * Copyright (C) 1994-1996, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: rsisamc.c,v $ - * 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(const struct rset_control *sel, void *parms, - int *flags); 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_hits (RSET ct, void *oi); static int r_read (RSFD rfd, void *buf); static int r_write (RSFD rfd, const void *buf); -static int r_score (RSFD rfd, int *score); +static void r_pos (RSFD rfd, double *current, double *total); -static const rset_control control = +static const struct rset_control control = { "isamc", - r_create, + r_delete, r_open, r_close, - r_delete, r_rewind, - r_count, - r_hits, + rset_default_forward, + r_pos, r_read, r_write, - r_score }; -const rset_control *rset_kind_isamc = &control; +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(const struct rset_control *sel, void *parms, - int *flags) +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; +} - *flags |= RSET_FLAG_VOLATILE; - info = xmalloc (sizeof(*info)); - info->is = pt->is; - info->pos = pt->pos; - info->ispt_list = NULL; - 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; + } + 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 = xmalloc (sizeof(*ptinfo)); - ptinfo->next = info->ispt_list; - info->ispt_list = ptinfo; - ptinfo->pt = isc_pp_open (info->is, info->pos); - ptinfo->info = info; - return ptinfo; + 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); -} - -static void r_delete (RSET ct) -{ - struct rset_isamc_info *info = ct->buf; + struct rset_pp_info *p=(struct rset_pp_info *)(rfd->priv); - logf (LOG_DEBUG, "rsisamc_delete"); - assert (info->ispt_list == NULL); - 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) -{ - return 0; -} - -static int r_hits (RSET ct, void *oi) -{ - return -1; -} - static int r_read (RSFD rfd, void *buf) { - 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) @@ -152,8 +131,9 @@ static int r_write (RSFD rfd, const void *buf) return -1; } -static int r_score (RSFD rfd, int *score) +static void r_pos (RSFD rfd, double *current, double *total) { - *score = -1; - return -1; + *current=-1; /* sorry, not implemented yet */ + *total=-1; } +