X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frset.c;h=e0d1d8089c732add50f06552ffa9e08ade0b62bf;hb=3db15cf883ad80b6a4b0e960f3c3b59c86b59c6b;hp=5050a1d13af79e06be349e4e0df846bcc65fc68a;hpb=5c7ad71f534d092eaf97f04dd39c5e874e0d45b0;p=idzebra-moved-to-github.git diff --git a/rset/rset.c b/rset/rset.c index 5050a1d..e0d1d80 100644 --- a/rset/rset.c +++ b/rset/rset.c @@ -1,10 +1,23 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1998, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rset.c,v $ - * Revision 1.7 1995-10-12 12:41:56 adam + * Revision 1.10 1998-02-10 11:56:46 adam + * Implemented rset_dup. + * + * Revision 1.9 1996/10/29 13:55:21 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.8 1995/12/11 09:15:23 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.7 1995/10/12 12:41:56 adam * Private info (buf) moved from struct rset_control to struct rset. * Bug fixes in relevance. * @@ -31,23 +44,33 @@ */ #include -#include +#include #include RSET rset_create(const rset_control *sel, void *parms) { - RSET new; + RSET rnew; logf (LOG_DEBUG, "rs_create(%s)", sel->desc); - new = xmalloc(sizeof(*new)); - new->control = sel; - new->buf = (*sel->f_create)(sel, parms); - return new; + rnew = xmalloc(sizeof(*rnew)); + rnew->control = sel; + rnew->flags = 0; + rnew->count = 1; + rnew->buf = (*sel->f_create)(sel, parms, &rnew->flags); + return rnew; } void rset_delete (RSET rs) { - (*rs->control->f_delete)(rs); + (rs->count)--; + if (!rs->count) + (*rs->control->f_delete)(rs); xfree(rs); } + +RSET rset_dup (RSET rs) +{ + (rs->count)++; + return rs; +}