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
/
rsisams.c
diff --git
a/rset/rsisams.c
b/rset/rsisams.c
index
683a545
..
046d2c4
100644
(file)
--- a/
rset/rsisams.c
+++ b/
rset/rsisams.c
@@
-1,6
+1,6
@@
-/* $Id: rsisams.c,v 1.13 2004-09-09 10:08:06 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: rsisams.c,v 1.18 2005-01-15 19:38:34 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.
@@
-30,8
+30,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
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 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 void r_pos (RSFD rfd, double *current, double *total);
static int r_write (RSFD rfd, const void *buf);
static void r_pos (RSFD rfd, double *current, double *total);
@@
-39,9
+38,9
@@
static const struct rset_control control =
{
"isams",
r_delete,
{
"isams",
r_delete,
+ rset_get_one_term,
r_open,
r_close,
r_open,
r_close,
- r_rewind,
rset_default_forward,
r_pos,
r_read,
rset_default_forward,
r_pos,
r_read,
@@
-61,9
+60,9
@@
struct rset_isams_info {
RSET rsisams_create( NMEM nmem, const struct key_control *kcontrol, int scope,
RSET rsisams_create( NMEM nmem, const struct key_control *kcontrol, int scope,
- ISAMS is, ISAMS_P pos)
+ ISAMS is, ISAMS_P pos, TERMID term)
{
{
- RSET rnew=rset_create_base(&control, nmem, kcontrol, scope);
+ RSET rnew=rset_create_base(&control, nmem, kcontrol, scope, term);
struct rset_isams_info *info;
info = (struct rset_isams_info *) nmem_malloc(rnew->nmem,sizeof(*info));
rnew->priv=info;
struct rset_isams_info *info;
info = (struct rset_isams_info *) nmem_malloc(rnew->nmem,sizeof(*info));
rnew->priv=info;
@@
-74,7
+73,7
@@
RSET rsisams_create( NMEM nmem, const struct key_control *kcontrol, int scope,
static void r_delete (RSET ct)
{
static void r_delete (RSET ct)
{
- logf (LOG_DEBUG, "rsisams_delete");
+ yaz_log (YLOG_DEBUG, "rsisams_delete");
rset_delete(ct);
}
rset_delete(ct);
}
@@
-85,10
+84,10
@@
RSFD r_open (RSET ct, int flag)
RSFD rfd;
struct rset_pp_info *ptinfo;
RSFD rfd;
struct rset_pp_info *ptinfo;
- logf (LOG_DEBUG, "risams_open");
+ yaz_log (YLOG_DEBUG, "risams_open");
if (flag & RSETF_WRITE)
{
if (flag & RSETF_WRITE)
{
- logf (LOG_FATAL, "ISAMS set type is read-only");
+ yaz_log (YLOG_FATAL, "ISAMS set type is read-only");
return NULL;
}
rfd=rfd_create_base(ct);
return NULL;
}
rfd=rfd_create_base(ct);
@@
-110,22
+109,20
@@
static void r_close (RSFD rfd)
rfd_delete_base(rfd);
}
rfd_delete_base(rfd);
}
-static void r_rewind (RSFD rfd)
-{
- logf (LOG_DEBUG, "rsisams_rewind");
- abort ();
-}
-
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
{
struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
{
struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
- return isams_pp_read(ptinfo->pt, buf);
+ int rc;
+ rc=isams_pp_read(ptinfo->pt, buf);
+ if (rc && term)
+ *term=rfd->rset->term;
+ return rc;
}
static int r_write (RSFD rfd, const void *buf)
{
}
static int r_write (RSFD rfd, const void *buf)
{
- logf (LOG_FATAL, "ISAMS set type is read-only");
+ yaz_log (YLOG_FATAL, "ISAMS set type is read-only");
return -1;
}
return -1;
}
@@
-134,3
+131,5
@@
static void r_pos (RSFD rfd, double *current, double *total)
*current=-1; /* sorry, not implemented yet */
*total=-1;
}
*current=-1; /* sorry, not implemented yet */
*total=-1;
}
+
+