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
Do not use readdir_r
[idzebra-moved-to-github.git]
/
index
/
zsets.c
diff --git
a/index/zsets.c
b/index/zsets.c
index
6db021b
..
17c7de6
100644
(file)
--- a/
index/zsets.c
+++ b/
index/zsets.c
@@
-1,4
+1,4
@@
-/* $Id: zsets.c,v 1.38 2002-08-02 19:26:56 adam Exp $
+/* $Id: zsets.c,v 1.40 2003-01-13 22:37:12 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
@@
-160,13
+160,13
@@
int zebra_resultSetTerms (ZebraHandle zh, const char *setname,
size_t inleft = strlen(inbuf);
size_t outleft = *len - 1;
int converted = 0;
size_t inleft = strlen(inbuf);
size_t outleft = *len - 1;
int converted = 0;
-#if HAVE_ICONV_H
- if (zh->iconv_from_utf8 != (iconv_t)(-1))
+
+ if (zh->iconv_from_utf8 != 0)
{
char *outbuf = out;
size_t ret;
{
char *outbuf = out;
size_t ret;
- ret = iconv(zh->iconv_from_utf8, &inbuf, &inleft,
+ ret = yaz_iconv(zh->iconv_from_utf8, &inbuf, &inleft,
&outbuf, &outleft);
if (ret == (size_t)(-1))
*len = 0;
&outbuf, &outleft);
if (ret == (size_t)(-1))
*len = 0;
@@
-174,7
+174,6
@@
int zebra_resultSetTerms (ZebraHandle zh, const char *setname,
*len = outbuf - out;
converted = 1;
}
*len = outbuf - out;
converted = 1;
}
-#endif
if (!converted)
{
if (inleft > outleft)
if (!converted)
{
if (inleft > outleft)
@@
-731,6
+730,8
@@
void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset)
do
{
kno++;
do
{
kno++;
+ yaz_log(LOG_LOG, "sysno=%d seqno=%d idx=%d", key.sysno, key.seqno,
+ term_index);
if (key.sysno != psysno)
{
score = (*rc->calc) (handle, psysno);
if (key.sysno != psysno)
{
score = (*rc->calc) (handle, psysno);