X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsm_or.c;h=dee79551bc196290d8f9b7c2399a948f84bda943;hb=863d336f803da454e03f39ee2225719fed05021e;hp=a0f37a507e7db332bdfcf3193997b7f5ad1a18aa;hpb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;p=idzebra-moved-to-github.git diff --git a/rset/rsm_or.c b/rset/rsm_or.c index a0f37a5..dee7955 100644 --- a/rset/rsm_or.c +++ b/rset/rsm_or.c @@ -1,67 +1,55 @@ -/* - * Copyright (C) 1994-1998, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: rsm_or.c,v $ - * Revision 1.8 1999-05-26 07:49:14 adam - * C++ compilation. - * - * Revision 1.7 1998/09/22 10:03:46 adam - * Changed result sets to be persistent in the sense that they can - * be re-searched if needed. - * Fixed memory leak in rsm_or. - * - * Revision 1.6 1998/03/05 08:36:28 adam - * New result set model. - * - * Revision 1.5 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.4 1997/10/31 12:37:55 adam - * Code calls xfree() instead of free(). - * - * Revision 1.3 1997/09/09 13:38:16 adam - * Partial port to WIN95/NT. - * - * Revision 1.2 1996/12/23 15:30:49 adam - * Work on truncation. - * - * Revision 1.1 1996/12/20 11:07:21 adam - * Implemented Multi-or result set. - * - */ +/* $Id: rsm_or.c,v 1.20 2004-08-20 14:44:46 heikki Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 + 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 #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 const struct rset_control control = { - "multi-or", + "m-or (old)", r_create, r_open, r_close, r_delete, r_rewind, - r_count, + rset_default_forward, /* FIXME */ + rset_default_pos, /* FIXME */ r_read, r_write, }; @@ -73,7 +61,7 @@ struct rset_mor_info { int no_rec; int (*cmp)(const void *p1, const void *p2); ISAMC isc; - ISAM_P *isam_positions; + ISAMC_P *isam_positions; int no_isam_positions; int no_save_positions; @@ -100,6 +88,7 @@ struct rset_mor_rfd { struct rset_mor_rfd *next; struct rset_mor_info *info; struct trunc_info *ti; + char *pbuf; }; static void heap_swap (struct trunc_info *ti, int i1, int i2) @@ -177,6 +166,7 @@ struct trunc_info *heap_init (int size, int key_size, static void heap_close (struct trunc_info *ti) { + xfree (ti->buf); xfree (ti->ptr); xfree (ti->indx); xfree (ti->heap); @@ -200,7 +190,7 @@ static void *r_create (RSET ct, const struct rset_control *sel, void *parms) info->isc = r_parms->isc; info->no_isam_positions = r_parms->no_isam_positions; - info->isam_positions = (ISAM_P *) + info->isam_positions = (ISAMC_P *) xmalloc (sizeof(*info->isam_positions) * info->no_isam_positions); memcpy (info->isam_positions, r_parms->isam_positions, sizeof(*info->isam_positions) * info->no_isam_positions); @@ -250,6 +240,7 @@ static RSFD r_open (RSET ct, int flag) } } rfd->position = info->no_save_positions; + rfd->pbuf = 0; r_rewind (rfd); return rfd; } @@ -270,6 +261,7 @@ static void r_close (RSFD rfd) if (((struct rset_mor_rfd *) rfd)->ispt[i]) isc_pp_close (((struct rset_mor_rfd *) rfd)->ispt[i]); xfree (((struct rset_mor_rfd *)rfd)->ispt); + xfree (((struct rset_mor_rfd *)rfd)->pbuf); xfree (rfd); return; } @@ -280,15 +272,8 @@ static void r_close (RSFD rfd) static void r_delete (RSET ct) { struct rset_mor_info *info = (struct rset_mor_info *) ct->buf; - int i; - assert (info->rfd_list == NULL); xfree (info->isam_positions); - - for (i = 0; ino_rset_terms; i++) - rset_term_destroy (ct->rset_terms[i]); - xfree (ct->rset_terms); - xfree (info); } @@ -296,19 +281,15 @@ static void r_rewind (RSFD rfd) { } -static int r_count (RSET ct) -{ - return 0; -} -static int r_read (RSFD rfd, void *buf, int *term_index) +static int r_read (RSFD rfd, void *buf) { - struct trunc_info *ti = ((struct rset_mor_rfd *) rfd)->ti; + struct rset_mor_rfd *mrfd = (struct rset_mor_rfd *) rfd; + struct trunc_info *ti = mrfd->ti; int n = ti->indx[ti->ptr[1]]; if (!ti->heapnum) return 0; - *term_index = 0; memcpy (buf, ti->heap[ti->ptr[1]], ti->keysize); if (((struct rset_mor_rfd *) rfd)->position) { @@ -321,6 +302,13 @@ static int r_read (RSFD rfd, void *buf, int *term_index) } else heap_delete (ti); + rfd->pbuf = xmalloc (info->key_size); + if (mrfd->countp && ( + *mrfd->countp == 0 || (*ti->cmp)(buf, mrfd->pbuf) > 1)) + { + memcpy (mrfd->pbuf, buf, ti->keysize); + (*mrfd->countp)++; + } return 1; } while (1) @@ -337,6 +325,12 @@ static int r_read (RSFD rfd, void *buf, int *term_index) break; } } + if (mrfd->countp && ( + *mrfd->countp == 0 || (*ti->cmp)(buf, mrfd->pbuf) > 1)) + { + memcpy (mrfd->pbuf, buf, ti->keysize); + (*mrfd->countp)++; + } return 1; }