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
More fixes regarding bug #248: hit counts in combinatoric (and)
[idzebra-moved-to-github.git]
/
rset
/
rsprox.c
diff --git
a/rset/rsprox.c
b/rset/rsprox.c
index
072ff3a
..
9876029
100644
(file)
--- a/
rset/rsprox.c
+++ b/
rset/rsprox.c
@@
-1,4
+1,4
@@
-/* $Id: rsprox.c,v 1.2 2004-06-14 21:44:26 adam Exp $
+/* $Id: rsprox.c,v 1.5.2.1 2004-10-05 13:31:42 adam 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
@@
-40,7
+40,6
@@
static void r_rewind (RSFD rfd);
static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf);
static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
int (*cmpfunc)(const void *p1, const void *p2),
const void *untilbuf);
-static int r_count (RSET ct);
static int r_read (RSFD rfd, void *buf, int *term_index);
static int r_write (RSFD rfd, const void *buf);
static int r_read (RSFD rfd, void *buf, int *term_index);
static int r_write (RSFD rfd, const void *buf);
@@
-53,7
+52,7
@@
static const struct rset_control control_prox =
r_delete,
r_rewind,
r_forward,
r_delete,
r_rewind,
r_forward,
- r_count,
+ rset_default_pos,
r_read,
r_write,
};
r_read,
r_write,
};
@@
-72,6
+71,8
@@
struct rset_prox_rfd {
char *more; /* more in each lookahead? */
struct rset_prox_rfd *next;
struct rset_prox_info *info;
char *more; /* more in each lookahead? */
struct rset_prox_rfd *next;
struct rset_prox_info *info;
+ int *countp;
+ char *pbuf;
};
static void *r_create (RSET ct, const struct rset_control *sel, void *parms)
};
static void *r_create (RSET ct, const struct rset_control *sel, void *parms)
@@
-85,8
+86,10
@@
static void *r_create (RSET ct, const struct rset_control *sel, void *parms)
const char *flags = NULL;
int term_type = 0;
const char *flags = NULL;
int term_type = 0;
+
info = (struct rset_prox_info *) xmalloc (sizeof(*info));
memcpy(&info->p, prox_parms, sizeof(struct rset_prox_parms));
info = (struct rset_prox_info *) xmalloc (sizeof(*info));
memcpy(&info->p, prox_parms, sizeof(struct rset_prox_parms));
+ assert(info->p.rset_no >= 2);
info->p.rset = xmalloc(info->p.rset_no * sizeof(*info->p.rset));
memcpy(info->p.rset, prox_parms->rset,
info->p.rset_no * sizeof(*info->p.rset));
info->p.rset = xmalloc(info->p.rset_no * sizeof(*info->p.rset));
memcpy(info->p.rset, prox_parms->rset,
info->p.rset_no * sizeof(*info->p.rset));
@@
-125,6
+128,7
@@
static void *r_create (RSET ct, const struct rset_control *sel, void *parms)
ct->rset_terms[0] = rset_term_create (prox_term, length_prox_term,
flags, term_type);
ct->rset_terms[0] = rset_term_create (prox_term, length_prox_term,
flags, term_type);
+
return info;
}
return info;
}
@@
-158,6
+162,9
@@
static RSFD r_open (RSET ct, int flag)
for (i = 0; i < info->p.rset_no; i++)
rfd->more[i] = rset_read (info->p.rset[i], rfd->rfd[i],
rfd->buf[i], &dummy);
for (i = 0; i < info->p.rset_no; i++)
rfd->more[i] = rset_read (info->p.rset[i], rfd->rfd[i],
rfd->buf[i], &dummy);
+
+ rfd->countp = &ct->rset_terms[0]->count;
+ rfd->pbuf = xmalloc (info->p.key_size);
return rfd;
}
return rfd;
}
@@
-175,6
+182,8
@@
static void r_close (RSFD rfd)
xfree ((*rfdp)->buf);
xfree ((*rfdp)->more);
xfree ((*rfdp)->buf);
xfree ((*rfdp)->more);
+ xfree ((*rfdp)->pbuf);
+
for (i = 0; i<info->p.rset_no; i++)
rset_close (info->p.rset[i], (*rfdp)->rfd[i]);
xfree ((*rfdp)->rfd);
for (i = 0; i<info->p.rset_no; i++)
rset_close (info->p.rset[i], (*rfdp)->rfd[i]);
xfree ((*rfdp)->rfd);
@@
-251,7
+260,8
@@
static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
cmp = (*info->p.cmp) (p->buf[i], p->buf[i-1]);
if (cmp > 1)
{
cmp = (*info->p.cmp) (p->buf[i], p->buf[i-1]);
if (cmp > 1)
{
- p->more[i-1] = rset_forward (info->p.rset[i-1], p->rfd[i-1],
+ p->more[i-1] = rset_forward (info->p.rset[i-1],
+ p->rfd[i-1],
p->buf[i-1], &dummy,
info->p.cmp,
p->buf[i]);
p->buf[i-1], &dummy,
info->p.cmp,
p->buf[i]);
@@
-259,10
+269,12
@@
static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
}
else if (cmp == 1)
{
}
else if (cmp == 1)
{
- if ((*info->p.getseq)(p->buf[i-1]) +1 != (*info->p.getseq)(p->buf[i]))
+ if ((*info->p.getseq)(p->buf[i-1]) +1 !=
+ (*info->p.getseq)(p->buf[i]))
{
{
- p->more[i-1] = rset_read (info->p.rset[i-1], p->rfd[i-1],
- p->buf[i-1], &dummy);
+ p->more[i-1] = rset_read (
+ info->p.rset[i-1], p->rfd[i-1],
+ p->buf[i-1], &dummy);
break;
}
}
break;
}
}
@@
-282,6
+294,13
@@
static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
p->more[0] = rset_read (info->p.rset[0], p->rfd[0],
p->buf[0], &dummy);
p->more[0] = rset_read (info->p.rset[0], p->rfd[0],
p->buf[0], &dummy);
+
+ if (p->countp && (
+ *p->countp == 0 || (*info->p.cmp)(buf, p->pbuf) > 1))
+ {
+ memcpy (p->pbuf, buf, info->p.key_size);
+ (*p->countp)++;
+ }
return 1;
}
}
return 1;
}
}
@@
-292,11
+311,13
@@
static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
{
int cmp = (*info->p.cmp)(p->buf[0], p->buf[1]);
if (cmp < -1)
{
int cmp = (*info->p.cmp)(p->buf[0], p->buf[1]);
if (cmp < -1)
- p->more[0] = rset_read (info->p.rset[0], p->rfd[0], p->buf[0],
- term_index);
+ p->more[0] = rset_forward (info->p.rset[0], p->rfd[0],
+ p->buf[0],
+ term_index, info->p.cmp, p->buf[0]);
else if (cmp > 1)
else if (cmp > 1)
- p->more[1] = rset_read (info->p.rset[1], p->rfd[1], p->buf[1],
- term_index);
+ p->more[1] = rset_forward (info->p.rset[1], p->rfd[1],
+ p->buf[1],
+ term_index, info->p.cmp, p->buf[1]);
else
{
int seqno[500];
else
{
int seqno[500];
@@
-363,10
+384,6
@@
static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
return 0;
}
return 0;
}
-static int r_count (RSET ct)
-{
- return 0;
-}
static int r_read (RSFD rfd, void *buf, int *term_index)
{
static int r_read (RSFD rfd, void *buf, int *term_index)
{