projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First work on multi value sort ISAM
[idzebra-moved-to-github.git]
/
rset
/
rsmultiandor.c
diff --git
a/rset/rsmultiandor.c
b/rset/rsmultiandor.c
index
2714460
..
05aa3ff
100644
(file)
--- a/
rset/rsmultiandor.c
+++ b/
rset/rsmultiandor.c
@@
-1,8
+1,5
@@
-/* $Id: rsmultiandor.c,v 1.25 2006-08-16 13:14:55 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) 1995-2008 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
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;
*term = rset->term;
else
*term = it->term;
- assert(*term);
}
(mrfd->hits)++;
rdres = rset_read(it->fd, it->buf, &it->term);
}
(mrfd->hits)++;
rdres = rset_read(it->fd, it->buf, &it->term);