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
Switching to my new code, it seems to work on all my tests
[idzebra-moved-to-github.git]
/
rset
/
rsbool.c
diff --git
a/rset/rsbool.c
b/rset/rsbool.c
index
22260b4
..
ec03558
100644
(file)
--- a/
rset/rsbool.c
+++ b/
rset/rsbool.c
@@
-1,4
+1,4
@@
-/* $Id: rsbool.c,v 1.26 2004-05-30 18:09:31 adam Exp $
+/* $Id: rsbool.c,v 1.28 2004-06-02 12:31:23 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
@@
-20,8
+20,6
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-#define RSET_DEBUG 0
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-30,8
+28,9
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <rsbool.h>
#include <zebrautl.h>
#include <rsbool.h>
#include <zebrautl.h>
-/* for key_logdump. Debugging only */
-#include <../index/index.h>
+#ifndef RSET_DEBUG
+#define RSET_DEBUG 0
+#endif
static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
static RSFD r_open (RSET ct, int flag);
static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
static RSFD r_open (RSET ct, int flag);
@@
-104,6
+103,7
@@
struct rset_bool_info {
RSET rset_r;
int term_index_s;
int (*cmp)(const void *p1, const void *p2);
RSET rset_r;
int term_index_s;
int (*cmp)(const void *p1, const void *p2);
+ void (*log_item)(int logmask, const void *p, const char *txt);
struct rset_bool_rfd *rfd_list;
};
struct rset_bool_rfd *rfd_list;
};
@@
-133,6
+133,7
@@
static void *r_create (RSET ct, const struct rset_control *sel, void *parms)
if (rset_is_volatile(info->rset_l) || rset_is_volatile(info->rset_r))
ct->flags |= RSET_FLAG_VOLATILE;
info->cmp = bool_parms->cmp;
if (rset_is_volatile(info->rset_l) || rset_is_volatile(info->rset_r))
ct->flags |= RSET_FLAG_VOLATILE;
info->cmp = bool_parms->cmp;
+ info->log_item = bool_parms->log_item;
info->rfd_list = NULL;
info->term_index_s = info->rset_l->no_rset_terms;
info->rfd_list = NULL;
info->term_index_s = info->rset_l->no_rset_terms;
@@
-322,8
+323,8
@@
static int r_read_and (RSFD rfd, void *buf, int *term_index)
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_and [%p] looping: m=%d/%d c=%d t=%d",
rfd, p->more_l, p->more_r, cmp, p->tail);
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_and [%p] looping: m=%d/%d c=%d t=%d",
rfd, p->more_l, p->more_r, cmp, p->tail);
- key_logdump(LOG_DEBUG,p->buf_l);
- key_logdump(LOG_DEBUG,p->buf_r);
+ (*info->log_item)(LOG_DEBUG, p->buf_l, "left ");
+ (*info->log_item)(LOG_DEBUG, p->buf_r, "right ");
#endif
if (!cmp)
{
#endif
if (!cmp)
{
@@
-344,6
+345,7
@@
static int r_read_and (RSFD rfd, void *buf, int *term_index)
logf (LOG_DEBUG, "r_read_and [%p] returning R m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
key_logdump(LOG_DEBUG,buf);
logf (LOG_DEBUG, "r_read_and [%p] returning R m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
key_logdump(LOG_DEBUG,buf);
+ (*info->log_item)(LOG_DEBUG, buf, "");
#endif
return 1;
}
#endif
return 1;
}
@@
-357,7
+359,7
@@
static int r_read_and (RSFD rfd, void *buf, int *term_index)
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_and [%p] returning L m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_and [%p] returning L m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
- key_logdump(LOG_DEBUG,buf);
+ (*info->log_item)(LOG_DEBUG, buf, "");
#endif
return 1;
}
#endif
return 1;
}
@@
-377,7
+379,7
@@
static int r_read_and (RSFD rfd, void *buf, int *term_index)
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_and returning C m=%d/%d c=%d",
p->more_l, p->more_r, cmp);
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_and returning C m=%d/%d c=%d",
p->more_l, p->more_r, cmp);
- key_logdump(LOG_DEBUG,buf);
+ (*info->log_item)(LOG_DEBUG, buf, "");
#endif
return 1;
}
#endif
return 1;
}
@@
-394,7
+396,7
@@
static int r_read_and (RSFD rfd, void *buf, int *term_index)
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
- key_logdump(LOG_DEBUG,buf);
+ (*info->log_item)(LOG_DEBUG, buf, "");
#endif
return 1;
} else
#endif
return 1;
} else
@@
-427,7
+429,7
@@
static int r_read_and (RSFD rfd, void *buf, int *term_index)
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_and [%p] returning R tail m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
- key_logdump(LOG_DEBUG,buf);
+ (*info->log_item)(LOG_DEBUG, buf, "");
#endif
return 1;
}
#endif
return 1;
}
@@
-443,7
+445,7
@@
static int r_read_and (RSFD rfd, void *buf, int *term_index)
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_and [%p] returning L tail m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_and [%p] returning L tail m=%d/%d c=%d",
rfd, p->more_l, p->more_r, cmp);
- key_logdump(LOG_DEBUG,buf);
+ (*info->log_item)(LOG_DEBUG, buf, "");
#endif
return 1;
}
#endif
return 1;
}
@@
-497,7
+499,7
@@
static int r_read_or (RSFD rfd, void *buf, int *term_index)
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_or returning A m=%d/%d c=%d",
p->more_l, p->more_r, cmp);
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_or returning A m=%d/%d c=%d",
p->more_l, p->more_r, cmp);
- key_logdump(LOG_DEBUG,buf);
+ (*info->log_item)(LOG_DEBUG, buf, "");
#endif
return 1;
}
#endif
return 1;
}
@@
-510,7
+512,7
@@
static int r_read_or (RSFD rfd, void *buf, int *term_index)
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_or returning B m=%d/%d c=%d",
p->more_l, p->more_r, cmp);
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_or returning B m=%d/%d c=%d",
p->more_l, p->more_r, cmp);
- key_logdump(LOG_DEBUG,buf);
+ (*info->log_item)(LOG_DEBUG, buf, "");
#endif
return 1;
}
#endif
return 1;
}
@@
-523,7
+525,7
@@
static int r_read_or (RSFD rfd, void *buf, int *term_index)
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_or returning C m=%d/%d c=%d",
p->more_l, p->more_r, cmp);
#if RSET_DEBUG
logf (LOG_DEBUG, "r_read_or returning C m=%d/%d c=%d",
p->more_l, p->more_r, cmp);
- key_logdump(LOG_DEBUG,buf);
+ (*info->log_item)(LOG_DEBUG, buf, "");
#endif
return 1;
}
#endif
return 1;
}