-/* $Id: rsprox.c,v 1.14 2004-09-01 15:01:32 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: rsprox.c,v 1.23 2005-01-15 19:38:35 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
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_forward(RSFD rfd, void *buf, const void *untilbuf);
-static int r_read (RSFD rfd, void *buf);
+static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf);
+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 void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm);
static const struct rset_control control =
{
"prox",
r_delete,
+ r_get_terms,
r_open,
r_close,
- r_rewind,
r_forward,
r_pos,
r_read,
RSFD *rfd;
char **buf; /* lookahead key buffers */
char *more; /* more in each lookahead? */
+ TERMID *terms; /* lookahead terms */
zint hits;
};
-RSET rsprox_create( NMEM nmem, const struct key_control *kcontrol,
+RSET rsprox_create( NMEM nmem, const struct key_control *kcontrol, int scope,
int rset_no, RSET *rset,
int ordered, int exclusion,
int relation, int distance)
{
- RSET rnew=rset_create_base(&control, nmem, kcontrol);
+ RSET rnew=rset_create_base(&control, nmem, kcontrol, scope,0);
struct rset_prox_info *info;
info = (struct rset_prox_info *) nmem_malloc(rnew->nmem,sizeof(*info));
info->rset = nmem_malloc(rnew->nmem,rset_no * sizeof(*info->rset));
if (flag & RSETF_WRITE)
{
- logf (LOG_FATAL, "prox set type is read-only");
+ yaz_log (YLOG_FATAL, "prox set type is read-only");
return NULL;
}
rfd = rfd_create_base(ct);
rfd->priv=p;
p->more = nmem_malloc (ct->nmem,sizeof(*p->more) * info->rset_no);
p->buf = nmem_malloc(ct->nmem,sizeof(*p->buf) * info->rset_no);
- for (i = 0; i < info->rset_no; i++)
+ p->terms = nmem_malloc(ct->nmem,sizeof(*p->terms) * info->rset_no);
+ for (i = 0; i < info->rset_no; i++)
+ {
p->buf[i] = nmem_malloc(ct->nmem,ct->keycontrol->key_size);
+ p->terms[i] = 0;
+ }
p->rfd = nmem_malloc(ct->nmem,sizeof(*p->rfd) * info->rset_no);
}
- logf(LOG_DEBUG,"rsprox (%s) open [%p] n=%d",
+ yaz_log(YLOG_DEBUG,"rsprox (%s) open [%p] n=%d",
ct->control->desc, rfd, info->rset_no);
for (i = 0; i < info->rset_no; i++) {
p->rfd[i] = rset_open (info->rset[i], RSETF_READ);
- p->more[i] = rset_read (p->rfd[i], p->buf[i]);
+ p->more[i] = rset_read (p->rfd[i], p->buf[i], &p->terms[i]);
}
p->hits=0;
return rfd;
rfd_delete_base(rfd);
}
-static void r_rewind (RSFD rfd)
-{
- struct rset_prox_info *info = (struct rset_prox_info *)(rfd->rset->priv);
- struct rset_prox_rfd *p=(struct rset_prox_rfd *)(rfd->priv);
- int i;
-
- logf (LOG_DEBUG, "rsprox_rewind");
-
- for (i = 0; i < info->rset_no; i++)
- {
- rset_rewind (p->rfd[i]);
- p->more[i] = rset_read (p->rfd[i], p->buf[i]);
- }
- p->hits=0;
-}
-
-static int r_forward (RSFD rfd, void *buf, const void *untilbuf)
+static int r_forward (RSFD rfd, void *buf, TERMID *term, const void *untilbuf)
{
struct rset_prox_info *info = (struct rset_prox_info *)(rfd->rset->priv);
struct rset_prox_rfd *p=(struct rset_prox_rfd *)(rfd->priv);
if (untilbuf)
{
/* it is enough to forward first one. Other will follow. */
- if ( p->more[0] && ((kctrl->cmp)(untilbuf, p->buf[0]) >= 2) )
- p->more[0] = rset_forward(p->rfd[0], p->buf[0], untilbuf);
+ if ( p->more[0] && /* was: cmp >=2 */
+ ((kctrl->cmp)(untilbuf, p->buf[0]) >= rfd->rset->scope) )
+ p->more[0] = rset_forward(p->rfd[0], p->buf[0],
+ &p->terms[0], untilbuf);
}
if (info->ordered && info->relation == 3 && info->exclusion == 0
&& info->distance == 1)
break;
}
cmp = (*kctrl->cmp) (p->buf[i], p->buf[i-1]);
- if (cmp > 1)
+ if (cmp >= rfd->rset->scope ) /* cmp>1 */
{
p->more[i-1] = rset_forward (p->rfd[i-1],
p->buf[i-1],
+ &p->terms[i-1],
p->buf[i]);
break;
}
- else if (cmp == 1)
+ else if ( cmp>0 ) /* cmp == 1*/
{
if ((*kctrl->getseq)(p->buf[i-1]) +1 !=
(*kctrl->getseq)(p->buf[i]))
{ /* FIXME - We need more flexible multilevel stuff */
- p->more[i-1] = rset_read ( p->rfd[i-1], p->buf[i-1]);
+ p->more[i-1] = rset_read ( p->rfd[i-1], p->buf[i-1],
+ &p->terms[i-1]);
break;
}
}
else
{
p->more[i] = rset_forward (p->rfd[i],
- p->buf[i], p->buf[i-1]);
+ p->buf[i], &p->terms[i], p->buf[i-1]);
break;
}
}
if (i == info->rset_no)
{
memcpy (buf, p->buf[0], kctrl->key_size);
- p->more[0] = rset_read (p->rfd[0], p->buf[0]);
+ if (term)
+ *term=p->terms[0];
+ p->more[0] = rset_read (p->rfd[0], p->buf[0], &p->terms[0]);
p->hits++;
return 1;
}
while (p->more[0] && p->more[1])
{
int cmp = (*kctrl->cmp)(p->buf[0], p->buf[1]);
- if (cmp < -1)
- p->more[0] = rset_forward (p->rfd[0],
- p->buf[0], p->buf[0]);
- /* FIXME - this certainly looks wrong! */
- else if (cmp > 1)
- p->more[1] = rset_forward (p->rfd[1],
- p->buf[1], p->buf[1]);
+ if ( cmp <= - rfd->rset->scope) /* cmp<-1*/
+ p->more[0] = rset_forward (p->rfd[0], p->buf[0],
+ &p->terms[0],p->buf[1]);
+ else if ( cmp >= rfd->rset->scope ) /* cmp>1 */
+ p->more[1] = rset_forward (p->rfd[1], p->buf[1],
+ &p->terms[1],p->buf[0]);
else
{
zint seqno[500]; /* FIXME - why 500 ?? */
seqno[n++] = (*kctrl->getseq)(p->buf[0]);
while ((p->more[0] = rset_read (p->rfd[0],
- p->buf[0])) >= -1 &&
+ p->buf[0], &p->terms[0])) >= -1 &&
p->more[0] <= -1)
if (n < 500)
seqno[n++] = (*kctrl->getseq)(p->buf[0]);
if (excl)
{
memcpy (buf, p->buf[1], kctrl->key_size);
-
- p->more[1] = rset_read ( p->rfd[1], p->buf[1]);
+ if (term)
+ *term=p->terms[1];
+ p->more[1] = rset_read ( p->rfd[1], p->buf[1],
+ &p->terms[1]);
p->hits++;
return 1;
}
}
- p->more[1] = rset_read (p->rfd[1], p->buf[1]);
+ p->more[1] = rset_read (p->rfd[1], p->buf[1],&p->terms[1]);
}
}
}
}
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
{
- return r_forward(rfd, buf, 0);
+ return r_forward(rfd, buf, term, 0);
}
static int r_write (RSFD rfd, const void *buf)
{
- logf (LOG_FATAL, "prox set type is read-only");
+ yaz_log (YLOG_FATAL, "prox set type is read-only");
return -1;
}
struct rset_prox_info *info = (struct rset_prox_info *)(rfd->rset->priv);
struct rset_prox_rfd *p=(struct rset_prox_rfd *)(rfd->priv);
int i;
- double cur,tot=-1;
- double scur=0,stot=0;
- double r;
+ double r = 0.0;
+ double cur, tot = -1.0;
+ double scur = 0.0, stot = 0.0;
- logf (LOG_DEBUG, "rsprox_pos");
+ yaz_log (YLOG_DEBUG, "rsprox_pos");
for (i = 0; i < info->rset_no; i++)
{
*current=p->hits;
*total=*current/r ;
}
- logf(LOG_DEBUG,"prox_pos: [%d] %0.1f/%0.1f= %0.4f ",
+ yaz_log(YLOG_DEBUG,"prox_pos: [%d] %0.1f/%0.1f= %0.4f ",
i,*current, *total, r);
}
+
+
+
+static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm)
+{
+ struct rset_prox_info *info =
+ (struct rset_prox_info *) ct->priv;
+ int i;
+ for (i=0;i<info->rset_no;i++)
+ rset_getterms(info->rset[i], terms, maxterms, curterm);
+}
+
projects / idzebra-moved-to-github.git / blobdiff