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
Removed the term count stuff from all rsets, and fixed what ever that broke.
[idzebra-moved-to-github.git]
/
rset
/
rsisamb.c
diff --git
a/rset/rsisamb.c
b/rset/rsisamb.c
index
bac75e9
..
1c24650
100644
(file)
--- a/
rset/rsisamb.c
+++ b/
rset/rsisamb.c
@@
-1,4
+1,4
@@
-/* $Id: rsisamb.c,v 1.10 2004-08-03 14:54:41 heikki Exp $
+/* $Id: rsisamb.c,v 1.15 2004-08-20 14:44:46 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-36,11
+36,11
@@
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_close (RSFD rfd);
static void r_delete (RSET ct);
static void r_rewind (RSFD rfd);
-static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
+static int r_forward(RSET ct, RSFD rfd, void *buf,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf);
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf);
-static void r_pos (RSFD rfd, int *current, int *total);
-static int r_read (RSFD rfd, void *buf, int *term_index);
+static void r_pos (RSFD rfd, double *current, double *total);
+static int r_read (RSFD rfd, void *buf);
static int r_write (RSFD rfd, const void *buf);
static const struct rset_control control =
static int r_write (RSFD rfd, const void *buf);
static const struct rset_control control =
@@
-63,7
+63,6
@@
struct rset_pp_info {
ISAMB_PP pt;
struct rset_pp_info *next;
struct rset_isamb_info *info;
ISAMB_PP pt;
struct rset_pp_info *next;
struct rset_isamb_info *info;
- int *countp;
void *buf;
};
void *buf;
};
@@
-87,9
+86,6
@@
static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
info->key_size = pt->key_size;
info->cmp = pt->cmp;
info->ispt_list = NULL;
info->key_size = pt->key_size;
info->cmp = pt->cmp;
info->ispt_list = NULL;
- ct->no_rset_terms = 1;
- ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
- ct->rset_terms[0] = pt->rset_term;
return info;
}
return info;
}
@@
-109,10
+105,6
@@
RSFD r_open (RSET ct, int flag)
info->ispt_list = ptinfo;
ptinfo->pt = isamb_pp_open (info->is, info->pos);
ptinfo->info = info;
info->ispt_list = ptinfo;
ptinfo->pt = isamb_pp_open (info->is, info->pos);
ptinfo->info = info;
- if (ct->rset_terms[0]->nn < 0)
- ct->rset_terms[0]->nn = isamb_pp_num (ptinfo->pt);
- ct->rset_terms[0]->count = 0;
- ptinfo->countp = &ct->rset_terms[0]->count;
ptinfo->buf = xmalloc (info->key_size);
return ptinfo;
}
ptinfo->buf = xmalloc (info->key_size);
return ptinfo;
}
@@
-141,8
+133,6
@@
static void r_delete (RSET ct)
logf (LOG_DEBUG, "rsisamb_delete");
assert (info->ispt_list == NULL);
logf (LOG_DEBUG, "rsisamb_delete");
assert (info->ispt_list == NULL);
- rset_term_destroy (ct->rset_terms[0]);
- xfree (ct->rset_terms);
xfree (info);
}
xfree (info);
}
@@
-152,7
+142,7
@@
static void r_rewind (RSFD rfd)
abort ();
}
abort ();
}
-static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
+static int r_forward(RSET ct, RSFD rfd, void *buf,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf)
{
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf)
{
@@
-172,27
+162,23
@@
static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
return i;
}
return i;
}
-static void r_pos (RSFD rfd, int *current, int *total)
+static void r_pos (RSFD rfd, double *current, double *total)
{
struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
assert(rfd);
isamb_pp_pos(pinfo->pt, current, total);
{
struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
assert(rfd);
isamb_pp_pos(pinfo->pt, current, total);
+#if RSET_DEBUG
+ logf(LOG_DEBUG,"isamb.r_pos returning %0.1f/%0.1f",
+ *current, *total);
+#endif
}
}
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static int r_read (RSFD rfd, void *buf)
{
struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
int r;
{
struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
int r;
- *term_index = 0;
+
r = isamb_pp_read(pinfo->pt, buf);
r = isamb_pp_read(pinfo->pt, buf);
- if (r > 0)
- {
- if (*pinfo->countp == 0 || (*pinfo->info->cmp)(buf, pinfo->buf) > 1)
- {
- memcpy (pinfo->buf, buf, pinfo->info->key_size);
- (*pinfo->countp)++;
- }
- }
return r;
}
return r;
}