X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzsets.c;h=e424abe35e3283af159734710a2d650048b49797;hb=e1352999e1be86b0ce5c2698bb62f9fc7d598a4f;hp=a20056b77ddad7176796a79469f435e1d6f99a70;hpb=161aa7805930f6b91ccea027e4afa4ccce41c379;p=idzebra-moved-to-github.git

diff --git a/index/zsets.c b/index/zsets.c
index a20056b..e424abe 100644
--- a/index/zsets.c
+++ b/index/zsets.c
@@ -1,5 +1,5 @@
-/* $Id: zsets.c,v 1.114 2006-12-18 23:40:08 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: zsets.c,v 1.117 2007-01-16 15:31:23 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -58,6 +58,7 @@ struct zebra_set {
     int term_entries_max;
     struct zebra_set *next;
     int locked;
+    int estimated_hit_count;
 
     zint cache_position;  /* last position */
     RSFD cache_rfd;       /* rfd (NULL if not existing) */
@@ -95,8 +96,8 @@ static void loglevels(void)
 }
 
 
-ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem,
-			  Z_RPNQuery *rpn, ZebraSet sset)
+static ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem,
+                                 Z_RPNQuery *rpn, ZebraSet sset)
 {
     RSET rset = 0;
     oident *attrset;
@@ -104,8 +105,6 @@ ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem,
     int sort_status, i;
     ZEBRA_RES res = ZEBRA_OK;
 
-    zh->hits = 0;
-
     sort_sequence = (Z_SortKeySpecList *)
         nmem_malloc(nmem, sizeof(*sort_sequence));
     sort_sequence->num_specs = 10; /* FIXME - Hard-coded number */
@@ -147,15 +146,17 @@ ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem,
 }
 
 
-ZEBRA_RES resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn,
-			   int num_bases, char **basenames,
-			   const char *setname)
+ZEBRA_RES resultSetAddRPN(ZebraHandle zh, NMEM m, Z_RPNQuery *rpn,
+                          int num_bases, char **basenames,
+                          const char *setname,
+                          zint *hits, int *estimated_hit_count)
 {
     ZebraSet zebraSet;
     int i;
     ZEBRA_RES res;
 
-    zh->hits = 0;
+    *hits = 0;
+    *estimated_hit_count = 0;
 
     zebraSet = resultSetAdd(zh, setname, 1);
     if (!zebraSet)
@@ -173,7 +174,10 @@ ZEBRA_RES resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn,
 
     res = resultSetSearch(zh, zebraSet->nmem, zebraSet->rset_nmem,
 			  rpn, zebraSet);
-    zh->hits = zebraSet->hits;
+    *hits = zebraSet->hits;
+    if (zebraSet->estimated_hit_count)
+        *estimated_hit_count = 1;
+
     if (zebraSet->rset)
         zebraSet->rpn = rpn;
     zebraSet->locked = 0;
@@ -273,6 +277,7 @@ ZebraSet resultSetAdd(ZebraHandle zh, const char *name, int ov)
     s->cache_position = 0;
     s->cache_rfd = 0;
     s->approx_limit = zh->approx_limit;
+    s->estimated_hit_count = 0;
     return s;
 }
 
@@ -987,6 +992,7 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet,
     sort_info = zebraSet->sort_info;
     sort_info->num_entries = 0;
     zebraSet->hits = 0;
+    zebraSet->estimated_hit_count = 0;
     rset_getterms(rset, 0, 0, &n);
     terms = (TERMID *) nmem_malloc(nmem, sizeof(*terms)*n);
     rset_getterms(rset, terms, n, &numTerms);
@@ -1023,7 +1029,10 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet,
 	    if (this_sys != psysno) 
 	    {   /* new record .. */
 		if (rfd->counted_items > rset->hits_limit)
+                {
+                    zebraSet->estimated_hit_count = 1;
 		    break;
+                }
 		if (psysno)
 		{   /* only if we did have a previous record */
 		    score = (*rc->calc) (handle, psysno, pstaticrank,