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
Added a few files to be ignored
[idzebra-moved-to-github.git]
/
rset
/
rsbetween.c
diff --git
a/rset/rsbetween.c
b/rset/rsbetween.c
index
5081bd7
..
9078c2f
100644
(file)
--- a/
rset/rsbetween.c
+++ b/
rset/rsbetween.c
@@
-1,6
+1,6
@@
-/* $Id: rsbetween.c,v 1.32 2004-11-19 10:27:13 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: rsbetween.c,v 1.38 2005-05-03 09:11:35 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.
@@
-26,7
+26,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
* example "Shakespeare" in between "<author>" and </author>. The thing is
* complicated by the inclusion of attributes (from their own rset). If attrs
* specified, they must match the "left" rset (start tag). "Hamlet" between
* example "Shakespeare" in between "<author>" and </author>. The thing is
* complicated by the inclusion of attributes (from their own rset). If attrs
* specified, they must match the "left" rset (start tag). "Hamlet" between
- * "<title lang=eng>" and "</title>". (This assumes that the attributes are
+ * "<title lang = eng>" and "</title>". (This assumes that the attributes are
* indexed to the same seqno as the tags).
*
*/
* indexed to the same seqno as the tags).
*
*/
@@
-36,13
+36,13
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <string.h>
#include <assert.h>
#include <string.h>
#include <assert.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
#include <rset.h>
#include <rset.h>
-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 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_forward(RSFD rfd, void *buf,
TERMID *term, const void *untilbuf);
static int r_read(RSFD rfd, void *buf, TERMID *term );
@@
-63,9
+63,6
@@
static const struct rset_control control =
r_write,
};
r_write,
};
-
-const struct rset_control *rset_kind_between = &control;
-
#define STARTTAG 0
#define HIT 1
#define STOPTAG 2
#define STARTTAG 0
#define HIT 1
#define STOPTAG 2
@@
-90,8
+87,8
@@
struct rset_between_rfd {
zint hits;
};
zint hits;
};
-static int log_level=0;
-static int log_level_initialized=0;
+static int log_level = 0;
+static int log_level_initialized = 0;
/* make sure that the rset has a term attached. If not, create one */
/* make sure that the rset has a term attached. If not, create one */
@@
-100,27
+97,26
@@
static void checkterm( RSET rs, char *tag, NMEM nmem)
{
if (!rs->term)
{
{
if (!rs->term)
{
- rs->term=
- rset_term_create(tag,strlen(tag),"",0,nmem);
- rs->term->rset=rs;
+ rs->term = rset_term_create(tag, strlen(tag), "", 0, nmem);
+ rs->term->rset = rs;
}
}
}
}
-RSET rsbetween_create( NMEM nmem, const struct key_control *kcontrol,
- int scope,
- RSET rset_l, RSET rset_m, RSET rset_r, RSET rset_attr)
+RSET rsbetween_create(NMEM nmem, struct rset_key_control *kcontrol,
+ int scope,
+ RSET rset_l, RSET rset_m, RSET rset_r, RSET rset_attr)
{
{
- RSET rnew=rset_create_base(&control, nmem, kcontrol, scope,0);
+ RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,0);
struct rset_between_info *info=
(struct rset_between_info *) nmem_malloc(rnew->nmem,sizeof(*info));
RSET rsetarray[4];
struct rset_between_info *info=
(struct rset_between_info *) nmem_malloc(rnew->nmem,sizeof(*info));
RSET rsetarray[4];
- int n=4;
+ int n = 4;
if (!log_level_initialized)
{
if (!log_level_initialized)
{
- log_level=yaz_log_module_level("rsbetween");
- log_level_initialized=1;
+ log_level = yaz_log_module_level("rsbetween");
+ log_level_initialized = 1;
}
rsetarray[STARTTAG] = rset_l;
rsetarray[HIT] = rset_m;
}
rsetarray[STARTTAG] = rset_l;
rsetarray[HIT] = rset_m;
@@
-130,28
+126,28
@@
RSET rsbetween_create( NMEM nmem, const struct key_control *kcontrol,
/* make sure we have decent terms for all rsets. Create dummies if needed*/
checkterm( rsetarray[STARTTAG], "(start)",nmem);
checkterm( rsetarray[STOPTAG], "(start)",nmem);
/* make sure we have decent terms for all rsets. Create dummies if needed*/
checkterm( rsetarray[STARTTAG], "(start)",nmem);
checkterm( rsetarray[STOPTAG], "(start)",nmem);
- info->startterm=rsetarray[STARTTAG]->term;
- info->stopterm=rsetarray[STOPTAG]->term;
+ info->startterm = rsetarray[STARTTAG]->term;
+ info->stopterm = rsetarray[STOPTAG]->term;
if (rset_attr)
{
checkterm( rsetarray[ATTRTAG], "(start)",nmem);
if (rset_attr)
{
checkterm( rsetarray[ATTRTAG], "(start)",nmem);
- info->attrterm=rsetarray[ATTRTAG]->term;
- n=4;
+ info->attrterm = rsetarray[ATTRTAG]->term;
+ n = 4;
}
else
{
}
else
{
- info->attrterm=NULL;
- n=3;
+ info->attrterm = NULL;
+ n = 3;
}
}
- info->andset=rsmultiand_create( nmem, kcontrol, scope, n, rsetarray);
- rnew->priv=info;
+ info->andset = rsmulti_and_create( nmem, kcontrol, scope, n, rsetarray);
+ rnew->priv = info;
yaz_log(log_level,"create rset at %p",rnew);
return rnew;
}
yaz_log(log_level,"create rset at %p",rnew);
return rnew;
}
-static void r_delete (RSET ct)
+static void r_delete(RSET ct)
{
struct rset_between_info *info = (struct rset_between_info *) ct->priv;
yaz_log(log_level,"delete rset at %p",ct);
{
struct rset_between_info *info = (struct rset_between_info *) ct->priv;
yaz_log(log_level,"delete rset at %p",ct);
@@
-159,7
+155,7
@@
static void r_delete (RSET ct)
}
}
-static RSFD r_open (RSET ct, int flag)
+static RSFD r_open(RSET ct, int flag)
{
struct rset_between_info *info = (struct rset_between_info *) ct->priv;
RSFD rfd;
{
struct rset_between_info *info = (struct rset_between_info *) ct->priv;
RSFD rfd;
@@
-167,34
+163,34
@@
static RSFD r_open (RSET ct, int flag)
if (flag & RSETF_WRITE)
{
if (flag & RSETF_WRITE)
{
- yaz_log (YLOG_FATAL, "between set type is read-only");
+ yaz_log(YLOG_FATAL, "between set type is read-only");
return NULL;
}
return NULL;
}
- rfd=rfd_create_base(ct);
+ rfd = rfd_create_base(ct);
if (rfd->priv)
p=(struct rset_between_rfd *)rfd->priv;
else {
p = (struct rset_between_rfd *) nmem_malloc(ct->nmem, (sizeof(*p)));
if (rfd->priv)
p=(struct rset_between_rfd *)rfd->priv;
else {
p = (struct rset_between_rfd *) nmem_malloc(ct->nmem, (sizeof(*p)));
- rfd->priv=p;
+ rfd->priv = p;
p->recbuf = nmem_malloc(ct->nmem, (ct->keycontrol->key_size));
p->startbuf = nmem_malloc(ct->nmem, (ct->keycontrol->key_size));
p->attrbuf = nmem_malloc(ct->nmem, (ct->keycontrol->key_size));
}
p->recbuf = nmem_malloc(ct->nmem, (ct->keycontrol->key_size));
p->startbuf = nmem_malloc(ct->nmem, (ct->keycontrol->key_size));
p->attrbuf = nmem_malloc(ct->nmem, (ct->keycontrol->key_size));
}
- p->andrfd = rset_open (info->andset, RSETF_READ);
+ p->andrfd = rset_open(info->andset, RSETF_READ);
p->hits=-1;
p->hits=-1;
- p->depth=0;
- p->attrdepth=0;
- p->attrbufok=0;
- p->startbufok=0;
+ p->depth = 0;
+ p->attrdepth = 0;
+ p->attrbufok = 0;
+ p->startbufok = 0;
yaz_log(log_level,"open rset=%p rfd=%p", ct, rfd);
return rfd;
}
yaz_log(log_level,"open rset=%p rfd=%p", ct, rfd);
return rfd;
}
-static void r_close (RSFD rfd)
+static void r_close(RSFD rfd)
{
struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
yaz_log(log_level,"close rfd=%p", rfd);
{
struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
yaz_log(log_level,"close rfd=%p", rfd);
- rset_close (p->andrfd);
+ rset_close(p->andrfd);
rfd_delete_base(rfd);
}
rfd_delete_base(rfd);
}
@@
-206,7
+202,7
@@
static int r_forward(RSFD rfd, void *buf,
struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
int rc;
yaz_log(log_level, "forwarding ");
struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
int rc;
yaz_log(log_level, "forwarding ");
- rc=rset_forward(p->andrfd,buf,term,untilbuf);
+ rc = rset_forward(p->andrfd,buf,term,untilbuf);
return rc;
}
return rc;
}
@@
-214,9
+210,10
@@
static int r_forward(RSFD rfd, void *buf,
static void checkattr(RSFD rfd)
{
static void checkattr(RSFD rfd)
{
- struct rset_between_info *info =(struct rset_between_info *)rfd->rset->priv;
- struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
- const struct key_control *kctrl=rfd->rset->keycontrol;
+ struct rset_between_info *info =(struct rset_between_info *)
+ rfd->rset->priv;
+ struct rset_between_rfd *p = (struct rset_between_rfd *)rfd->priv;
+ const struct rset_key_control *kctrl = rfd->rset->keycontrol;
int cmp;
if (p->attrdepth)
return; /* already found one */
int cmp;
if (p->attrdepth)
return; /* already found one */
@@
-230,21
+227,22
@@
static void checkattr(RSFD rfd)
cmp=(kctrl->cmp)(p->startbuf,p->attrbuf);
if (0==cmp) /* and the keys match */
{
cmp=(kctrl->cmp)(p->startbuf,p->attrbuf);
if (0==cmp) /* and the keys match */
{
- p->attrdepth=p->depth;
+ p->attrdepth = p->depth;
yaz_log(log_level, "found attribute match at depth %d",p->attrdepth);
}
}
}
yaz_log(log_level, "found attribute match at depth %d",p->attrdepth);
}
}
}
-static int r_read (RSFD rfd, void *buf, TERMID *term)
+static int r_read(RSFD rfd, void *buf, TERMID *term)
{
{
- struct rset_between_info *info =(struct rset_between_info *)rfd->rset->priv;
- struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
- const struct key_control *kctrl=rfd->rset->keycontrol;
+ struct rset_between_info *info =
+ (struct rset_between_info *)rfd->rset->priv;
+ struct rset_between_rfd *p = (struct rset_between_rfd *)rfd->priv;
+ const struct rset_key_control *kctrl = rfd->rset->keycontrol;
int cmp;
int cmp;
+ TERMID dummyterm = 0;
yaz_log(log_level,"== read: term=%p",term);
yaz_log(log_level,"== read: term=%p",term);
- TERMID dummyterm=0;
if (!term)
term=&dummyterm;
while ( rset_read(p->andrfd,buf,term) )
if (!term)
term=&dummyterm;
while ( rset_read(p->andrfd,buf,term) )
@@
-254,8
+252,8
@@
static int r_read (RSFD rfd, void *buf, TERMID *term)
if (p->hits<0)
{/* first time? */
memcpy(p->recbuf,buf,kctrl->key_size);
if (p->hits<0)
{/* first time? */
memcpy(p->recbuf,buf,kctrl->key_size);
- p->hits=0;
- cmp=rfd->rset->scope; /* force newrecord */
+ p->hits = 0;
+ cmp = rfd->rset->scope; /* force newrecord */
}
else {
cmp=(kctrl->cmp)(buf,p->recbuf);
}
else {
cmp=(kctrl->cmp)(buf,p->recbuf);
@@
-265,8
+263,8
@@
static int r_read (RSFD rfd, void *buf, TERMID *term)
if (cmp>=rfd->rset->scope)
{
yaz_log(log_level,"new record");
if (cmp>=rfd->rset->scope)
{
yaz_log(log_level,"new record");
- p->depth=0;
- p->attrdepth=0;
+ p->depth = 0;
+ p->attrdepth = 0;
memcpy(p->recbuf,buf,kctrl->key_size);
}
memcpy(p->recbuf,buf,kctrl->key_size);
}
@@
-277,13
+275,13
@@
static int r_read (RSFD rfd, void *buf, TERMID *term)
p->depth++;
yaz_log(log_level,"read start tag. d=%d",p->depth);
memcpy(p->startbuf,buf,kctrl->key_size);
p->depth++;
yaz_log(log_level,"read start tag. d=%d",p->depth);
memcpy(p->startbuf,buf,kctrl->key_size);
- p->startbufok=1;
+ p->startbufok = 1;
checkattr(rfd); /* in case we already saw the attr here */
}
else if (*term==info->stopterm)
{
if (p->depth == p->attrdepth)
checkattr(rfd); /* in case we already saw the attr here */
}
else if (*term==info->stopterm)
{
if (p->depth == p->attrdepth)
- p->attrdepth=0; /* ending the tag with attr match */
+ p->attrdepth = 0; /* ending the tag with attr match */
p->depth--;
yaz_log(log_level,"read end tag. d=%d ad=%d",p->depth, p->attrdepth);
}
p->depth--;
yaz_log(log_level,"read end tag. d=%d ad=%d",p->depth, p->attrdepth);
}
@@
-291,7
+289,7
@@
static int r_read (RSFD rfd, void *buf, TERMID *term)
{
yaz_log(log_level,"read attr");
memcpy(p->attrbuf,buf,kctrl->key_size);
{
yaz_log(log_level,"read attr");
memcpy(p->attrbuf,buf,kctrl->key_size);
- p->attrbufok=1;
+ p->attrbufok = 1;
checkattr(rfd); /* in case the start tag came first */
}
else
checkattr(rfd); /* in case the start tag came first */
}
else
@@
-313,14
+311,14
@@
static int r_read (RSFD rfd, void *buf, TERMID *term)
} /* r_read */
} /* r_read */
-static int r_write (RSFD rfd, const void *buf)
+static int r_write(RSFD rfd, const void *buf)
{
{
- yaz_log (YLOG_FATAL, "between set type is read-only");
+ yaz_log(YLOG_FATAL, "between set type is read-only");
return -1;
}
return -1;
}
-static void r_pos (RSFD rfd, double *current, double *total)
+static void r_pos(RSFD rfd, double *current, double *total)
{
struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
rset_pos(p->andrfd,current, total);
{
struct rset_between_rfd *p=(struct rset_between_rfd *)rfd->priv;
rset_pos(p->andrfd,current, total);