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
Fix bug #249: rstemp sets fail. Problem was that rset files were
[idzebra-moved-to-github.git]
/
rset
/
rsnull.c
diff --git
a/rset/rsnull.c
b/rset/rsnull.c
index
29322af
..
f073744
100644
(file)
--- a/
rset/rsnull.c
+++ b/
rset/rsnull.c
@@
-1,6
+1,6
@@
-/* $Id: rsnull.c,v 1.23 2004-08-26 11:11:59 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: rsnull.c,v 1.31 2005-01-15 19:38:35 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-25,25
+25,23
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdio.h>
#include <assert.h>
#include <zebrautl.h>
#include <stdio.h>
#include <assert.h>
#include <zebrautl.h>
-#include <rsnull.h>
+#include <rset.h>
-/* FIXME - Use the nmem instead of xmalloc all the way through */
static RSFD r_open (RSET ct, int flag);
static void r_close (RSFD rfd);
static void r_delete (RSET ct);
static RSFD r_open (RSET ct, int flag);
static void r_close (RSFD rfd);
static void r_delete (RSET ct);
-static void r_rewind (RSFD rfd);
static void r_pos (RSFD rfd, double *current, double *total);
static void r_pos (RSFD rfd, double *current, double *total);
-static int r_read (RSFD rfd, void *buf);
+static int r_read (RSFD rfd, void *buf, TERMID *term);
static int r_write (RSFD rfd, const void *buf);
static const struct rset_control control =
{
"null",
static int r_write (RSFD rfd, const void *buf);
static const struct rset_control control =
{
"null",
+ r_delete,
+ rset_get_no_terms,
r_open,
r_close,
r_open,
r_close,
- r_delete,
- r_rewind,
rset_default_forward,
r_pos,
r_read,
rset_default_forward,
r_pos,
r_read,
@@
-52,41
+50,35
@@
static const struct rset_control control =
const struct rset_control *rset_kind_null = &control;
const struct rset_control *rset_kind_null = &control;
-RSET rsnull_create(NMEM nmem )
+RSET rsnull_create(NMEM nmem, const struct key_control *kcontrol )
{
{
- RSET rnew=rset_create_base(&control, nmem);
+ RSET rnew=rset_create_base(&control, nmem, kcontrol,0,0);
rnew->priv=NULL;
return rnew;
}
rnew->priv=NULL;
return rnew;
}
-#if 0
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
-{
- return NULL;
-}
-#endif
-
static RSFD r_open (RSET ct, int flag)
{
static RSFD r_open (RSET ct, int flag)
{
+ RSFD rfd;
if (flag & RSETF_WRITE)
{
if (flag & RSETF_WRITE)
{
- logf (LOG_FATAL, "NULL set type is read-only");
+ yaz_log (YLOG_FATAL, "NULL set type is read-only");
return NULL;
}
return NULL;
}
- return "";
+ rfd=rfd_create_base(ct);
+ rfd->priv=NULL;
+ return rfd;
}
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)
{
}
-static void r_rewind (RSFD rfd)
-{
-}
static void r_pos (RSFD rfd, double *current, double *total)
{
static void r_pos (RSFD rfd, double *current, double *total)
{
@@
-97,14
+89,16
@@
static void r_pos (RSFD rfd, double *current, double *total)
*current=0;
}
*current=0;
}
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
{
{
+ if (term)
+ *term=0; /* NULL */
return 0;
}
static int r_write (RSFD rfd, const void *buf)
{
return 0;
}
static int r_write (RSFD rfd, const void *buf)
{
- logf (LOG_FATAL, "NULL set type is read-only");
+ yaz_log (YLOG_FATAL, "NULL set type is read-only");
return -1;
}
return -1;
}