X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Frpnscan.c;fp=index%2Frpnscan.c;h=3312157fc21311f40629dc032725cc96323bb4d1;hp=6d575df76c9281dec3b63ad459fa06ca34d29564;hb=ebc8a5296010dd0379bf7ae81b6c31145f8e85a7;hpb=4e66751dbded138d3a4c5f6256d1a514b212db7e diff --git a/index/rpnscan.c b/index/rpnscan.c index 6d575df..3312157 100644 --- a/index/rpnscan.c +++ b/index/rpnscan.c @@ -1,4 +1,4 @@ -/* $Id: rpnscan.c,v 1.22 2007-11-13 13:41:51 adam Exp $ +/* $Id: rpnscan.c,v 1.23 2007-12-03 11:49:11 adam Exp $ Copyright (C) 1995-2007 Index Data ApS @@ -79,31 +79,6 @@ static ZEBRA_RES trans_scan_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, return ZEBRA_OK; } -static void count_set(ZebraHandle zh, RSET rset, zint *count, zint approx_limit) -{ - zint psysno = 0; - struct it_key key; - RSFD rfd; - - yaz_log(YLOG_DEBUG, "count_set"); - - rset->hits_limit = approx_limit; - - *count = 0; - rfd = rset_open(rset, RSETF_READ); - while (rset_read(rfd, &key,0 /* never mind terms */)) - { - if (key.mem[0] != psysno) - { - psysno = key.mem[0]; - if (rfd->counted_items >= rset->hits_limit) - break; - } - } - rset_close(rfd); - *count = rset->hits_count; -} - static void get_first_snippet_from_rset(ZebraHandle zh, RSET rset, zebra_snippets *snippets, zint *sysno) @@ -238,7 +213,7 @@ static int scan_save_set(ZebraHandle zh, ODR stream, NMEM nmem, rset = rset_create_and(nmem, kc, kc->scope, 2, rsets); } /* count it */ - count_set(zh, rset, &count, approx_limit); + zebra_count_set(zh, rset, &count, approx_limit); if (pos != -1) {