projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
[yaz-moved-to-github.git]
/
ztest
/
ztest.c
diff --git
a/ztest/ztest.c
b/ztest/ztest.c
index
4ebf1c1
..
6cc2bff
100644
(file)
--- a/
ztest/ztest.c
+++ b/
ztest/ztest.c
@@
-21,6
+21,9
@@
#if HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
#if HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
+#ifdef WIN32
+#include <windows.h>
+#endif
#include <yaz/log.h>
#include <yaz/backend.h>
#include <yaz/log.h>
#include <yaz/backend.h>
@@
-130,12
+133,16
@@
static Odr_int get_term_hit(Z_RPNStructure *s)
*/
static Odr_int get_hit_count(Z_Query *q)
{
*/
static Odr_int get_hit_count(Z_Query *q)
{
- Odr_int h = -1;
if (q->which == Z_Query_type_1 || q->which == Z_Query_type_101)
if (q->which == Z_Query_type_1 || q->which == Z_Query_type_101)
+ {
+ Odr_int h = -1;
h = get_term_hit(q->u.type_1->RPNStructure);
h = get_term_hit(q->u.type_1->RPNStructure);
- if (h == -1)
- h = rand() % 24;
- return h;
+ if (h == -1)
+ h = rand() % 24;
+ return h;
+ }
+ else
+ return 24;
}
/** \brief checks if it's a dummy Slow database
}
/** \brief checks if it's a dummy Slow database
@@
-284,7
+291,7
@@
int ztest_search(void *handle, bend_search_rr *rr)
const char *name = names[i];
const char *value = values[i];
if (!strcmp(name, "seed"))
const char *name = names[i];
const char *value = values[i];
if (!strcmp(name, "seed"))
- srandom(atoi(value));
+ srand(atoi(value));
else if (!strcmp(name, "search-delay"))
parse_delay(&new_set->search_delay, value);
else if (!strcmp(name, "present-delay"))
else if (!strcmp(name, "search-delay"))
parse_delay(&new_set->search_delay, value);
else if (!strcmp(name, "present-delay"))