X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=cb90afd19bee8044eae14debdfe194427a87f014;hb=8c2b1cb07e43a08cf1e0ac844c81d4e066eacf23;hp=b67839f77212283e7fbf365a6ce7f550c7af0120;hpb=b7942589b21cca1b6d44c7bf9446dcb6a5942953;p=idzebra-moved-to-github.git diff --git a/rset/rsisamc.c b/rset/rsisamc.c index b67839f..cb90afd 100644 --- a/rset/rsisamc.c +++ b/rset/rsisamc.c @@ -1,37 +1,44 @@ -/* - * Copyright (C) 1994-1996, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: rsisamc.c,v $ - * 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.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. + +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 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); +static int r_read (RSFD rfd, void *buf, int *term_index); static int r_write (RSFD rfd, const void *buf); -static int r_score (RSFD rfd, int *score); -static const rset_control control = +static const struct rset_control control = { "isamc", r_create, @@ -39,43 +46,51 @@ static const rset_control control = r_close, r_delete, r_rewind, + rset_default_forward, r_count, 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; + 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; }; -static void *r_create(const struct rset_control *sel, void *parms, - int *flags) +static void *r_create(RSET ct, const struct rset_control *sel, void *parms) { - rset_isamc_parms *pt = parms; + rset_isamc_parms *pt = (rset_isamc_parms *) parms; struct rset_isamc_info *info; - *flags |= RSET_FLAG_VOLATILE; - info = xmalloc (sizeof(*info)); + 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; } RSFD r_open (RSET ct, int flag) { - struct rset_isamc_info *info = ct->buf; + struct rset_isamc_info *info = (struct rset_isamc_info *) ct->buf; struct rset_pp_info *ptinfo; logf (LOG_DEBUG, "risamc_open"); @@ -84,11 +99,16 @@ RSFD r_open (RSET ct, int flag) logf (LOG_FATAL, "ISAMC set type is read-only"); return NULL; } - ptinfo = xmalloc (sizeof(*ptinfo)); + 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; } @@ -100,6 +120,7 @@ static void r_close (RSFD rfd) 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); @@ -111,10 +132,12 @@ static void r_close (RSFD rfd) static void r_delete (RSET ct) { - struct rset_isamc_info *info = ct->buf; + 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); } @@ -129,9 +152,21 @@ static int r_count (RSET ct) return 0; } -static int r_read (RSFD rfd, void *buf) +static int r_read (RSFD rfd, void *buf, int *term_index) { - return isc_pp_read( ((struct rset_pp_info*) rfd)->pt, buf); + struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd; + 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)++; + } + } + return r; } static int r_write (RSFD rfd, const void *buf) @@ -139,9 +174,3 @@ static int r_write (RSFD rfd, const void *buf) logf (LOG_FATAL, "ISAMC set type is read-only"); return -1; } - -static int r_score (RSFD rfd, int *score) -{ - *score = -1; - return -1; -}