X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisam.c;h=84b143bc5d839f84f5c38d4287aa4809209782a9;hb=9a14cd596da0fd59d38a62aa4e4535dfd89aa295;hp=b2ad821ac2007911a9487b363cba9eef363b6106;hpb=221024eb6b10e45d6479bb4154dd7de7fca1d477;p=idzebra-moved-to-github.git diff --git a/rset/rsisam.c b/rset/rsisam.c index b2ad821..84b143b 100644 --- a/rset/rsisam.c +++ b/rset/rsisam.c @@ -1,87 +1,41 @@ -/* - * Copyright (C) 1994-1995, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: rsisam.c,v $ - * Revision 1.17 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.16 1997/10/31 12:37:01 adam - * Code calls xfree() instead of free(). - * - * Revision 1.15 1996/10/29 13:55:22 adam - * Include of zebrautl.h instead of alexutil.h. - * - * Revision 1.14 1995/12/11 09:15:24 adam - * New set types: sand/sor/snot - ranked versions of and/or/not in - * ranked/semi-ranked result sets. - * Note: the snot not finished yet. - * New rset member: flag. - * Bug fix: r_delete in rsrel.c did free bad memory block. - * - * Revision 1.13 1995/10/12 12:41:56 adam - * Private info (buf) moved from struct rset_control to struct rset. - * Bug fixes in relevance. - * - * Revision 1.12 1995/10/10 14:00:04 adam - * Function rset_open changed its wflag parameter to general flags. - * - * Revision 1.11 1995/10/06 14:38:05 adam - * New result set method: r_score. - * Local no (sysno) and score is transferred to retrieveCtrl. - * - * Revision 1.10 1995/09/08 14:52:42 adam - * Work on relevance feedback. - * - * Revision 1.9 1995/09/07 13:58:43 adam - * New parameter: result-set file descriptor (RSFD) to support multiple - * positions within the same result-set. - * Boolean operators: and, or, not implemented. - * - * Revision 1.8 1995/09/06 16:11:56 adam - * More work on boolean sets. - * - * Revision 1.7 1995/09/06 10:35:44 adam - * Null set implemented. - * - * Revision 1.6 1995/09/05 11:43:24 adam - * Complete version of temporary sets. Not tested yet though. - * - * Revision 1.5 1995/09/04 12:33:56 adam - * Various cleanup. YAZ util used instead. - * - * Revision 1.4 1995/09/04 09:10:55 adam - * Minor changes. - * - * Revision 1.3 1994/11/22 13:15:37 quinn - * Simple - * - * Revision 1.2 1994/11/04 14:53:12 quinn - * Work - * - */ +/* $Id: rsisam.c,v 1.24 2004-01-16 15:27:35 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 -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_hits (RSET ct, void *oi); -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 = { "isam", r_create, @@ -89,14 +43,13 @@ static const rset_control control = r_close, r_delete, r_rewind, + rset_default_forward, r_count, - r_hits, r_read, r_write, - r_score }; -const rset_control *rset_kind_isam = &control; +const struct rset_control *rset_kind_isam = &control; struct rset_ispt_info { ISPT pt; @@ -110,23 +63,26 @@ struct rset_isam_info { struct rset_ispt_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_isam_parms *pt = parms; + rset_isam_parms *pt = (rset_isam_parms *) parms; struct rset_isam_info *info; - *flags |= RSET_FLAG_VOLATILE; - info = xmalloc (sizeof(struct rset_isam_info)); + ct->flags |= RSET_FLAG_VOLATILE; + info = (struct rset_isam_info *) xmalloc (sizeof(struct rset_isam_info)); info->is = pt->is; info->pos = pt->pos; 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_isam_info *info = ct->buf; + struct rset_isam_info *info = (struct rset_isam_info *) ct->buf; struct rset_ispt_info *ptinfo; logf (LOG_DEBUG, "risam_open"); @@ -135,11 +91,14 @@ RSFD r_open (RSET ct, int flag) logf (LOG_FATAL, "ISAM set type is read-only"); return NULL; } - ptinfo = xmalloc (sizeof(*ptinfo)); + ptinfo = (struct rset_ispt_info *) xmalloc (sizeof(*ptinfo)); ptinfo->next = info->ispt_list; info->ispt_list = ptinfo; ptinfo->pt = is_position (info->is, info->pos); ptinfo->info = info; + + if (ct->rset_terms[0]->nn < 0) + ct->rset_terms[0]->nn = is_numkeys (ptinfo->pt); return ptinfo; } @@ -162,10 +121,12 @@ static void r_close (RSFD rfd) static void r_delete (RSET ct) { - struct rset_isam_info *info = ct->buf; + struct rset_isam_info *info = (struct rset_isam_info *) ct->buf; logf (LOG_DEBUG, "rsisam_delete"); assert (info->ispt_list == NULL); + rset_term_destroy (ct->rset_terms[0]); + xfree (ct->rset_terms); xfree (info); } @@ -180,13 +141,9 @@ 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) +static int r_read (RSFD rfd, void *buf, int *term_index) { + *term_index = 0; return is_readkey( ((struct rset_ispt_info*) rfd)->pt, buf); } @@ -195,9 +152,3 @@ static int r_write (RSFD rfd, const void *buf) logf (LOG_FATAL, "ISAM set type is read-only"); return -1; } - -static int r_score (RSFD rfd, int *score) -{ - *score = -1; - return -1; -}