X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frpnscan.c;h=3312157fc21311f40629dc032725cc96323bb4d1;hb=b2084f54a96f78eede08dda6f98d5ee1f502e91b;hp=3402e77081a0864af7a67eade79bfe0b55adeea9;hpb=cb0ae247ea096af96d5fdb453290747fbbf032fd;p=idzebra-moved-to-github.git

diff --git a/index/rpnscan.c b/index/rpnscan.c
index 3402e77..3312157 100644
--- a/index/rpnscan.c
+++ b/index/rpnscan.c
@@ -1,4 +1,4 @@
-/* $Id: rpnscan.c,v 1.21 2007-11-05 11:20:39 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)
         {
@@ -290,7 +265,7 @@ static ZEBRA_RES rpn_scan_norm(ZebraHandle zh, ODR stream, NMEM nmem,
 {
     struct scan2_info_entry *ar = nmem_malloc(nmem, sizeof(*ar) * ord_no);
     struct rpn_char_map_info rcmi;
-    zebra_map_t zm = zebra_map_get(zh->reg->zebra_maps, index_type);
+    zebra_map_t zm = zebra_map_get_or_add(zh->reg->zebra_maps, index_type);
     int i, dif;
     int after_pos;
     int pos = 0;