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
Update for YAZ 3s libyaz_server.la
[idzebra-moved-to-github.git]
/
index
/
zsets.c
diff --git
a/index/zsets.c
b/index/zsets.c
index
111649d
..
fb997da
100644
(file)
--- a/
index/zsets.c
+++ b/
index/zsets.c
@@
-1,4
+1,4
@@
-/* $Id: zsets.c,v 1.119 2007-01-17 15:35:48 adam Exp $
+/* $Id: zsets.c,v 1.121 2007-04-16 08:44:32 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
Copyright (C) 1995-2007
Index Data ApS
@@
-100,7
+100,6
@@
static ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem,
Z_RPNQuery *rpn, ZebraSet sset)
{
RSET rset = 0;
Z_RPNQuery *rpn, ZebraSet sset)
{
RSET rset = 0;
- oident *attrset;
Z_SortKeySpecList *sort_sequence;
int sort_status, i;
ZEBRA_RES res = ZEBRA_OK;
Z_SortKeySpecList *sort_sequence;
int sort_status, i;
ZEBRA_RES res = ZEBRA_OK;
@@
-114,11
+113,9
@@
static ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem,
for (i = 0; i<sort_sequence->num_specs; i++)
sort_sequence->specs[i] = 0;
for (i = 0; i<sort_sequence->num_specs; i++)
sort_sequence->specs[i] = 0;
- attrset = oid_getentbyoid (rpn->attributeSetId);
-
rpn_get_top_approx_limit(zh, rpn->RPNStructure, &sset->approx_limit);
rpn_get_top_approx_limit(zh, rpn->RPNStructure, &sset->approx_limit);
- res = rpn_search_top(zh, rpn->RPNStructure, attrset->value,
+ res = rpn_search_top(zh, rpn->RPNStructure, rpn->attributeSetId,
nmem, rset_nmem,
sort_sequence,
sset->num_bases, sset->basenames,
nmem, rset_nmem,
sort_sequence,
sset->num_bases, sset->basenames,
@@
-1207,7
+1204,11
@@
ZEBRA_RES zebra_result_set_term_info(ZebraHandle zh, const char *setname,
if (ret == (size_t)(-1))
*termlen = 0;
else
if (ret == (size_t)(-1))
*termlen = 0;
else
+ {
+ yaz_iconv(zh->iconv_from_utf8, 0, 0,
+ &outbuf, &outleft);
*termlen = outbuf - termbuf;
*termlen = outbuf - termbuf;
+ }
}
else
{
}
else
{