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
Remove the obsolete rset public control variables. WS updates.
[idzebra-moved-to-github.git]
/
rset
/
rsmultiandor.c
diff --git
a/rset/rsmultiandor.c
b/rset/rsmultiandor.c
index
b5c1bd2
..
06005bd
100644
(file)
--- a/
rset/rsmultiandor.c
+++ b/
rset/rsmultiandor.c
@@
-1,4
+1,4
@@
-/* $Id: rsmultiandor.c,v 1.13 2005-01-15 20:47:16 adam Exp $
+/* $Id: rsmultiandor.c,v 1.16 2005-04-26 10:09:38 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-39,7
+39,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
#include <idzebra/isamc.h>
#include <rset.h>
#include <idzebra/isamc.h>
#include <rset.h>
@@
-69,6
+69,7
@@
static const struct rset_control control_or =
r_read_or,
r_write,
};
r_read_or,
r_write,
};
+
static const struct rset_control control_and =
{
"multi-and",
static const struct rset_control control_and =
{
"multi-and",
@@
-82,9
+83,6
@@
static const struct rset_control control_and =
r_write,
};
r_write,
};
-const struct rset_control *rset_kind_multior = &control_or;
-const struct rset_control *rset_kind_multiand = &control_and;
-
/* The heap structure:
* The rset contains a list or rsets we are ORing together
* The rfd contains a heap of heap-items, which contain
/* The heap structure:
* The rset contains a list or rsets we are ORing together
* The rfd contains a heap of heap-items, which contain
@@
-586,7
+584,7
@@
static void r_pos (RSFD rfd, double *current, double *total)
}
else
{
}
else
{
- *current = mrfd->hits;
+ *current = (double) (mrfd->hits);
*total = *current*stot/scur;
yaz_log(log_level, "r_pos: = %0.1f %0.1f", *current, *total);
}
*total = *current*stot/scur;
yaz_log(log_level, "r_pos: = %0.1f %0.1f", *current, *total);
}