-/* $Id: zsets.c,v 1.58 2004-08-30 12:32:24 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
#endif
#include "index.h"
-#include <rstemp.h>
+#include <rset.h>
#define SORT_IDX_ENTRYSIZE 64
#define ZSET_SORT_MAX_LEVEL 3
while (num_i < num && positions[num_i] < position)
num_i++;
rfd = rset_open (rset, RSETF_READ);
- while (num_i < num && rset_read (rset, rfd, &key))
+ while (num_i < num && rset_read (rfd, &key))
{
-#if IT_KEY_NEW
zint this_sys = key.mem[0];
-#else
- zint this_sys = key.sysno;
-#endif
if (this_sys != psysno)
{
psysno = this_sys;
}
}
}
- rset_close (rset, rfd);
+ rset_close (rfd);
}
}
return sr;
}
}
rfd = rset_open (rset, RSETF_READ);
- while (rset_read (rset, rfd, &key))
+ while (rset_read (rfd, &key))
{
-#if IT_KEY_NEW
zint this_sys = key.mem[0];
-#else
- zint this_sys = key.sysno;
-#endif
if (this_sys != psysno)
{
(sset->hits)++;
sort_criteria, num_criteria, psysno);
}
}
- rset_close (rset, rfd);
+ rset_close (rfd);
#if 0
for (i = 0; i < rset->no_rset_terms; i++)
zebraSet->hits = 0;
rfd = rset_open (rset, RSETF_READ);
- yaz_log (LOG_LOG, "resultSetRank");
-
rank_class = zebraRankLookup (zh, rank_handler_name);
if (!rank_class)
{
}
rc = rank_class->control;
- if (rset_read (rset, rfd, &key))
+ if (rset_read (rfd, &key))
{
-#if IT_KEY_NEW
zint psysno = key.mem[0];
-#else
- zint psysno = key.sysno;
-#endif
int score;
void *handle =
(*rc->begin) (zh->reg, rank_class->class_handle, rset);
est=-1; /* can not do */
do
{
-#if IT_KEY_NEW
zint this_sys = key.mem[0];
-#else
- zint this_sys = key.sysno;
-#endif
kno++;
if (this_sys != psysno)
{
if ( (est==-2) && (zebraSet->hits==esthits))
{ /* time to estimate the hits */
- rset_pos(rset,rfd,&cur,&tot);
+ rset_pos(rfd,&cur,&tot);
if (tot>0) {
ratio=cur/tot;
est=(zint)(0.5+zebraSet->hits/ratio);
}
}
}
- while (rset_read (rset, rfd, &key) && (est<0) );
+ while (rset_read (rfd, &key) && (est<0) );
score = (*rc->calc) (handle, psysno);
resultSetInsertRank (zh, sort_info, psysno, score, 'A');
(*rc->end) (zh->reg, handle);
}
- rset_close (rset, rfd);
+ rset_close (rfd);
/*
for (i = 0; i < rset->no_rset_terms; i++)
{
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);
}