X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzsets.c;h=fb997daf9da419a762edf4c1a1a91dfb52acab17;hb=7786ecc8ce35a72145aeb9c098a4cfcc9d3c4822;hp=a81f4d8351fa00b6a2600eed4db53fe280558a57;hpb=46d18b14e7af411cd9b9a4614e6bb0cb1a99069c;p=idzebra-moved-to-github.git diff --git a/index/zsets.c b/index/zsets.c index a81f4d8..fb997da 100644 --- a/index/zsets.c +++ b/index/zsets.c @@ -1,4 +1,4 @@ -/* $Id: zsets.c,v 1.120 2007-03-20 22:07:35 adam Exp $ +/* $Id: zsets.c,v 1.121 2007-04-16 08:44:32 adam Exp $ 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; - oident *attrset; 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; inum_specs; i++) sort_sequence->specs[i] = 0; - attrset = oid_getentbyoid (rpn->attributeSetId); - 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,