X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsmultiandor.c;h=d1439797c3e4bbb9ae41565895ce4068e17c6747;hp=2f9b359587ed27d7c1142a19549e2f34f58b7644;hb=89d16cf15eda0e4802d18b8ad09bd3653508ebfc;hpb=4478d785b7769691261005c98063b98a5a5971b3

diff --git a/rset/rsmultiandor.c b/rset/rsmultiandor.c
index 2f9b359..d143979 100644
--- a/rset/rsmultiandor.c
+++ b/rset/rsmultiandor.c
@@ -1,8 +1,5 @@
-/* $Id: rsmultiandor.c,v 1.24 2006-08-14 10:40:21 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2009 Index Data
 
 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
@@ -442,7 +439,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 +491,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 +529,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 */