X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frset.c;h=93fe8df7eea11738b1e5968d96517ce4a6685166;hb=f1a944fbdac20e88bf55918f2a4f66c301d684e2;hp=392a585030dae829ae216cc4325214e628242f0a;hpb=ac248aaee0b0be972370f6bab8e383302f3af6d3;p=idzebra-moved-to-github.git diff --git a/rset/rset.c b/rset/rset.c index 392a585..93fe8df 100644 --- a/rset/rset.c +++ b/rset/rset.c @@ -1,10 +1,19 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: rset.c,v $ - * Revision 1.12 1998-04-26 10:56:57 adam + * Revision 1.15 2002-03-20 20:24:30 adam + * Hits per term. Returned in SearchResult-1 + * + * Revision 1.14 1999/05/26 07:49:14 adam + * C++ compilation. + * + * Revision 1.13 1999/02/02 14:51:33 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.12 1998/04/26 10:56:57 adam * Added include of string.h. * * Revision 1.11 1998/03/05 08:36:28 adam @@ -61,7 +70,7 @@ RSET rset_create(const struct rset_control *sel, void *parms) int i; logf (LOG_DEBUG, "rs_create(%s)", sel->desc); - rnew = xmalloc(sizeof(*rnew)); + rnew = (RSET) xmalloc(sizeof(*rnew)); rnew->control = sel; rnew->flags = 0; rnew->count = 1; @@ -98,14 +107,14 @@ RSET_TERM *rset_terms(RSET rs, int *no) RSET_TERM rset_term_create (const char *name, int length, const char *flags) { - RSET_TERM t = xmalloc (sizeof(*t)); + RSET_TERM t = (RSET_TERM) xmalloc (sizeof(*t)); if (!name) t->name = NULL; else if (length == -1) t->name = xstrdup (name); else { - t->name = xmalloc (length+1); + t->name = (char*) xmalloc (length+1); memcpy (t->name, name, length); t->name[length] = '\0'; } @@ -113,7 +122,8 @@ RSET_TERM rset_term_create (const char *name, int length, const char *flags) t->flags = NULL; else t->flags = xstrdup (flags); - t->nn = 1; + t->nn = -1; + t->count = 0; return t; } @@ -126,7 +136,7 @@ void rset_term_destroy (RSET_TERM t) RSET_TERM rset_term_dup (RSET_TERM t) { - RSET_TERM nt = xmalloc (sizeof(*nt)); + RSET_TERM nt = (RSET_TERM) xmalloc (sizeof(*nt)); if (t->name) nt->name = xstrdup (t->name); else