X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsmultiandor.c;h=6c3145c4243e368fda6aa959e274cd2107a551c4;hb=ca8c7208a371bcfb79c846dfec9cd7cb42ecaf92;hp=2f9b359587ed27d7c1142a19549e2f34f58b7644;hpb=4478d785b7769691261005c98063b98a5a5971b3;p=idzebra-moved-to-github.git diff --git a/rset/rsmultiandor.c b/rset/rsmultiandor.c index 2f9b359..6c3145c 100644 --- a/rset/rsmultiandor.c +++ b/rset/rsmultiandor.c @@ -1,4 +1,4 @@ -/* $Id: rsmultiandor.c,v 1.24 2006-08-14 10:40:21 adam Exp $ +/* $Id: rsmultiandor.c,v 1.26 2006-09-08 14:40:55 adam Exp $ Copyright (C) 1995-2006 Index Data ApS @@ -442,7 +442,6 @@ static int r_read_or (RSFD rfd, void *buf, TERMID *term) *term = rset->term; else *term = it->term; - assert(*term); } (mrfd->hits)++; rdres = rset_read(it->fd, it->buf, &it->term); @@ -495,9 +494,7 @@ static int r_read_and (RSFD rfd, void *buf, TERMID *term) mintail = i; if (kctrl->get_segment) - { - /* segments enabled */ - + { /* segments enabled */ zint segment = kctrl->get_segment(p->items[i].buf); /* store segment if not stored already */ if (!p->segment && segment) @@ -535,7 +532,7 @@ static int r_read_and (RSFD rfd, void *buf, TERMID *term) (p->hits)++; return 1; } - /* not tailing, forward until all reocrds match, and set up */ + /* not tailing, forward until all records match, and set up */ /* as tails. the earlier 'if' will then return the hits */ if (p->eof) return 0; /* nothing more to see */