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 autoconf utility idzebra.m4 which defines --with-idzebra
[idzebra-moved-to-github.git]
/
index
/
zsets.c
diff --git
a/index/zsets.c
b/index/zsets.c
index
c25ac6a
..
cafa7aa
100644
(file)
--- a/
index/zsets.c
+++ b/
index/zsets.c
@@
-1,4
+1,4
@@
-/* $Id: zsets.c,v 1.60 2004-09-01 15:01:32 heikki Exp $
+/* $Id: zsets.c,v 1.62 2004-09-15 08:13:51 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
@@
-405,11
+405,7
@@
ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name,
rfd = rset_open (rset, RSETF_READ);
while (num_i < num && rset_read (rfd, &key))
{
rfd = rset_open (rset, RSETF_READ);
while (num_i < num && rset_read (rfd, &key))
{
-#if IT_KEY_NEW
zint this_sys = key.mem[0];
zint this_sys = key.mem[0];
-#else
- zint this_sys = key.sysno;
-#endif
if (this_sys != psysno)
{
psysno = this_sys;
if (this_sys != psysno)
{
psysno = this_sys;
@@
-692,11
+688,7
@@
void resultSetSortSingle (ZebraHandle zh, NMEM nmem,
rfd = rset_open (rset, RSETF_READ);
while (rset_read (rfd, &key))
{
rfd = rset_open (rset, RSETF_READ);
while (rset_read (rfd, &key))
{
-#if IT_KEY_NEW
zint this_sys = key.mem[0];
zint this_sys = key.mem[0];
-#else
- zint this_sys = key.sysno;
-#endif
if (this_sys != psysno)
{
(sset->hits)++;
if (this_sys != psysno)
{
(sset->hits)++;
@@
-750,8
+742,6
@@
void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
zebraSet->hits = 0;
rfd = rset_open (rset, RSETF_READ);
zebraSet->hits = 0;
rfd = rset_open (rset, RSETF_READ);
- yaz_log (LOG_LOG, "resultSetRank");
-
rank_class = zebraRankLookup (zh, rank_handler_name);
if (!rank_class)
{
rank_class = zebraRankLookup (zh, rank_handler_name);
if (!rank_class)
{
@@
-762,11
+752,7
@@
void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
if (rset_read (rfd, &key))
{
if (rset_read (rfd, &key))
{
-#if IT_KEY_NEW
zint psysno = key.mem[0];
zint psysno = key.mem[0];
-#else
- zint psysno = key.sysno;
-#endif
int score;
void *handle =
(*rc->begin) (zh->reg, rank_class->class_handle, rset);
int score;
void *handle =
(*rc->begin) (zh->reg, rank_class->class_handle, rset);
@@
-776,11
+762,7
@@
void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
est=-1; /* can not do */
do
{
est=-1; /* can not do */
do
{
-#if IT_KEY_NEW
zint this_sys = key.mem[0];
zint this_sys = key.mem[0];
-#else
- zint this_sys = key.sysno;
-#endif
kno++;
if (this_sys != psysno)
{
kno++;
if (this_sys != psysno)
{
@@
-837,7
+819,7
@@
void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
rset->rset_terms[i]->count);
}
*/
rset->rset_terms[i]->count);
}
*/
- yaz_log (LOG_LOG, ZINT_FORMAT " keys, "ZINT_FORMAT" distinct sysnos",
+ yaz_log (LOG_DEBUG, ZINT_FORMAT " keys, "ZINT_FORMAT" distinct sysnos",
kno, zebraSet->hits);
}
kno, zebraSet->hits);
}