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
Added test cases for @and, @or, @not including bug #619.
[idzebra-moved-to-github.git]
/
rset
/
rsnull.c
diff --git
a/rset/rsnull.c
b/rset/rsnull.c
index
09ee8c2
..
153e643
100644
(file)
--- a/
rset/rsnull.c
+++ b/
rset/rsnull.c
@@
-1,5
+1,5
@@
-/* $Id: rsnull.c,v 1.34 2005-05-03 09:11:36 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: rsnull.c,v 1.38 2006-06-06 21:01:31 adam Exp $
+ Copyright (C) 1995-2006
Index Data ApS
This file is part of the Zebra server.
Index Data ApS
This file is part of the Zebra server.
@@
-36,18
+36,19
@@
static const struct rset_control control =
{
"null",
r_delete,
{
"null",
r_delete,
- rset_get_no_terms,
+ rset_get_one_term,
r_open,
r_close,
r_open,
r_close,
- rset_default_forward,
+ 0, /* no forward */
r_pos,
r_read,
r_write,
};
r_pos,
r_read,
r_write,
};
-RSET rsnull_create(NMEM nmem, struct rset_key_control *kcontrol )
+RSET rset_create_null(NMEM nmem, struct rset_key_control *kcontrol,
+ TERMID term)
{
{
- RSET rnew = rset_create_base(&control, nmem, kcontrol, 0, 0);
+ RSET rnew = rset_create_base(&control, nmem, kcontrol, 0, term, 0, 0);
rnew->priv = 0;
return rnew;
}
rnew->priv = 0;
return rnew;
}
@@
-67,7
+68,6
@@
static RSFD r_open(RSET ct, int flag)
static void r_close(RSFD rfd)
{
static void r_close(RSFD rfd)
{
- rfd_delete_base(rfd);
}
static void r_delete(RSET ct)
}
static void r_delete(RSET ct)
@@
-79,8
+79,8
@@
static void r_pos(RSFD rfd, double *current, double *total)
assert(rfd);
assert(current);
assert(total);
assert(rfd);
assert(current);
assert(total);
- *total=0;
- *current=0;
+ *total = 0;
+ *current = 0;
}
static int r_read(RSFD rfd, void *buf, TERMID *term)
}
static int r_read(RSFD rfd, void *buf, TERMID *term)
@@
-92,7
+92,14
@@
static int r_read(RSFD rfd, void *buf, TERMID *term)
static int r_write(RSFD rfd, const void *buf)
{
static int r_write(RSFD rfd, const void *buf)
{
- yaz_log (YLOG_FATAL, "NULL set type is read-only");
+ yaz_log(YLOG_FATAL, "NULL set type is read-only");
return -1;
}
return -1;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */