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
Fixed bug #316: Numerical sort does not work for search.
[idzebra-moved-to-github.git]
/
rset
/
rsisams.c
diff --git
a/rset/rsisams.c
b/rset/rsisams.c
index
e634d58
..
50b559a
100644
(file)
--- a/
rset/rsisams.c
+++ b/
rset/rsisams.c
@@
-1,6
+1,6
@@
-/* $Id: rsisams.c,v 1.14 2004-09-30 09:53:05 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: rsisams.c,v 1.22 2005-05-03 09:11:36 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.
@@
-20,17
+20,15
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-
-
#include <stdio.h>
#include <assert.h>
#include <stdio.h>
#include <assert.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
#include <rset.h>
static RSFD r_open (RSET ct, int flag);
static void r_close (RSFD rfd);
static void r_delete (RSET ct);
#include <rset.h>
static RSFD r_open (RSET ct, int flag);
static void r_close (RSFD rfd);
static void r_delete (RSET ct);
-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);
@@
-38,6
+36,7
@@
static const struct rset_control control =
{
"isams",
r_delete,
{
"isams",
r_delete,
+ rset_get_one_term,
r_open,
r_close,
rset_default_forward,
r_open,
r_close,
rset_default_forward,
@@
-46,54
+45,53
@@
static const struct rset_control control =
r_write,
};
r_write,
};
-const struct rset_control *rset_kind_isams = &control;
-
-struct rset_pp_info {
+struct rfd_private {
ISAMS_PP pt;
};
ISAMS_PP pt;
};
-struct rset_isams_info {
+struct rset_private {
ISAMS is;
ISAMS is;
- ISAMS_P pos;
+ ISAM_P pos;
};
};
-RSET rsisams_create( NMEM nmem, const struct key_control *kcontrol, int scope,
- ISAMS is, ISAMS_P pos)
+RSET rsisams_create(NMEM nmem, struct rset_key_control *kcontrol,
+ int scope,
+ ISAMS is, ISAM_P pos, TERMID term)
{
{
- RSET rnew=rset_create_base(&control, nmem, kcontrol, scope);
- struct rset_isams_info *info;
- info = (struct rset_isams_info *) nmem_malloc(rnew->nmem,sizeof(*info));
- rnew->priv=info;
- info->is=is;
- info->pos=pos;
+ RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term);
+ struct rset_private *info;
+ info = (struct rset_private *) nmem_malloc(rnew->nmem,sizeof(*info));
+ rnew->priv = info;
+ info->is = is;
+ info->pos = pos;
return rnew;
}
static void r_delete (RSET ct)
{
return rnew;
}
static void r_delete (RSET ct)
{
- logf (LOG_DEBUG, "rsisams_delete");
+ yaz_log (YLOG_DEBUG, "rsisams_delete");
rset_delete(ct);
}
RSFD r_open (RSET ct, int flag)
{
rset_delete(ct);
}
RSFD r_open (RSET ct, int flag)
{
- struct rset_isams_info *info = (struct rset_isams_info *) ct->priv;
+ struct rset_private *info = (struct rset_private *) ct->priv;
RSFD rfd;
RSFD rfd;
- struct rset_pp_info *ptinfo;
+ struct rfd_private *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);
if (rfd->priv)
return NULL;
}
rfd=rfd_create_base(ct);
if (rfd->priv)
- ptinfo=(struct rset_pp_info *)(rfd->priv);
+ ptinfo=(struct rfd_private *)(rfd->priv);
else {
else {
- ptinfo = (struct rset_pp_info *) nmem_malloc(ct->nmem,sizeof(*ptinfo));
+ ptinfo = (struct rfd_private *) nmem_malloc(ct->nmem,sizeof(*ptinfo));
ptinfo->pt = isams_pp_open (info->is, info->pos);
rfd->priv=ptinfo;
}
ptinfo->pt = isams_pp_open (info->is, info->pos);
rfd->priv=ptinfo;
}
@@
-102,22
+100,26
@@
RSFD r_open (RSET ct, int flag)
static void r_close (RSFD rfd)
{
static void r_close (RSFD rfd)
{
- struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
+ struct rfd_private *ptinfo = (struct rfd_private *)(rfd->priv);
isams_pp_close (ptinfo->pt);
rfd_delete_base(rfd);
}
isams_pp_close (ptinfo->pt);
rfd_delete_base(rfd);
}
-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);
- return isams_pp_read(ptinfo->pt, buf);
+ struct rfd_private *ptinfo = (struct rfd_private *)(rfd->priv);
+ 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;
}
@@
-126,3
+128,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;
}
+
+