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
Bug fix: Leading and trailing white space weren't removed in scan tokens.
[idzebra-moved-to-github.git]
/
index
/
zsets.c
diff --git
a/index/zsets.c
b/index/zsets.c
index
f4f21e8
..
0c71974
100644
(file)
--- a/
index/zsets.c
+++ b/
index/zsets.c
@@
-4,7
+4,14
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zsets.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zsets.c,v $
- * Revision 1.9 1995-10-17 18:02:14 adam
+ * Revision 1.11 1996-12-23 15:30:46 adam
+ * Work on truncation.
+ * Bug fix: result sets weren't deleted after server shut down.
+ *
+ * Revision 1.10 1995/10/30 15:08:08 adam
+ * Bug fixes.
+ *
+ * Revision 1.9 1995/10/17 18:02:14 adam
* New feature: databases. Implemented as prefix to words in dictionary.
*
* Revision 1.8 1995/10/10 13:59:25 adam
* New feature: databases. Implemented as prefix to words in dictionary.
*
* Revision 1.8 1995/10/10 13:59:25 adam
@@
-76,6
+83,20
@@
ZServerSet *resultSetGet (ZServerInfo *zi, const char *name)
return NULL;
}
return NULL;
}
+void resultSetDestroy (ZServerInfo *zi)
+{
+ ZServerSet *s, *s1;
+
+ for (s = zi->sets; s; s = s1)
+ {
+ s1 = s->next;
+ rset_delete (s->rset);
+ xfree (s->name);
+ xfree (s);
+ }
+ zi->sets = NULL;
+}
+
ZServerSetSysno *resultSetSysnoGet (ZServerInfo *zi, const char *name,
int num, int *positions)
{
ZServerSetSysno *resultSetSysnoGet (ZServerInfo *zi, const char *name,
int num, int *positions)
{
@@
-101,11
+122,11
@@
ZServerSetSysno *resultSetSysnoGet (ZServerInfo *zi, const char *name,
{
psysno = key.sysno;
position++;
{
psysno = key.sysno;
position++;
+ assert (num_i < num);
if (position == positions[num_i])
{
sr[num_i].sysno = psysno;
rset_score (rset, rfd, &sr[num_i].score);
if (position == positions[num_i])
{
sr[num_i].sysno = psysno;
rset_score (rset, rfd, &sr[num_i].score);
- num_i++;
if (++num_i == num)
break;
}
if (++num_i == num)
break;
}