X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frset.c;h=e6cb176e37f2079bf5b274e16b83ed35a03aad9b;hp=52f3033a1cf298bbacc6d7f3a1acd08b688f4e9a;hb=89d3a004b7c651fd5673abfc192e1472dc4d4197;hpb=7a2d0f25682890bde5d8f2883d6020df2ed0b365

diff --git a/rset/rset.c b/rset/rset.c
index 52f3033..e6cb176 100644
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,5 +1,5 @@
-/* $Id: rset.c,v 1.50 2005-06-07 14:53:39 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: rset.c,v 1.57 2007-01-15 15:10:19 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <stdio.h>
@@ -78,13 +78,16 @@ void rset_close(RSFD rfd)
     {
 	TERMID termid;
 	char buf[100];
-	while(rfd->counted_items < rs->hits_limit
+	while(rfd->counted_items <= rs->hits_limit
 	      && rset_default_read(rfd, buf, &termid))
 	    ;
 	
 	rs->hits_count = rfd->counted_items;
+	yaz_log(log_level, "rset_close rset=%p hits_count=" ZINT_FORMAT
+		" hits_limit=" ZINT_FORMAT,
+		rs, rs->hits_count, rs->hits_limit);
 	rs->hits_approx = 0;
-	if (rs->hits_count >= rs->hits_limit)
+	if (rs->hits_count > rs->hits_limit)
 	{
 	    double cur, tot;
 	    zint est;
@@ -159,6 +162,9 @@ RSET rset_create_base(const struct rset_control *sel,
 
     rset = (RSET) nmem_malloc(nmem, sizeof(*rset));
     yaz_log(log_level, "rs_create(%s) rs=%p (nm=%p)", sel->desc, rset, nmem); 
+    yaz_log(log_level, " ref_id=%s limit=" ZINT_FORMAT, 
+	    (term && term->ref_id ? term->ref_id : "null"),
+	    rset->hits_limit);
     rset->nmem = nmem;
     rset->control = sel;
     rset->refcount = 1;
@@ -166,15 +172,18 @@ RSET rset_create_base(const struct rset_control *sel,
     rset->free_list = NULL;
     rset->use_list = NULL;
     rset->hits_count = 0;
-    rset->hits_limit = 1000;
+    rset->hits_limit = 0;
     rset->hits_round = 1000;
     rset->keycontrol = kcontrol;
+
     (*kcontrol->inc)(kcontrol);
     rset->scope = scope;
     rset->term = term;
     if (term)
+    {
         term->rset = rset;
-
+	rset->hits_limit = term->hits_limit;
+    }
     rset->no_children = no_children;
     rset->children = 0;
     if (no_children)
@@ -235,7 +244,6 @@ RSET rset_dup (RSET rs)
     (rs->refcount)++;
     yaz_log(log_level, "rs_dup(%s), rs=%p, refcount=%d",
             rs->control->desc, rs, rs->refcount); 
-    (*rs->keycontrol->inc)(rs->keycontrol);
     return rs;
 }
 
@@ -308,10 +316,13 @@ struct ord_list *ord_list_dup(NMEM nmem, struct ord_list *list)
    \param nmem memory for term.
    \param ol ord list
    \param reg_type register type
+   \param hits_limit limit before counting stops and gets approximate
+   \param ref_id supplied ID for term that can be used to identify this
 */
 TERMID rset_term_create(const char *name, int length, const char *flags,
 			int type, NMEM nmem, struct ord_list *ol,
-			int reg_type)
+			int reg_type,
+			zint hits_limit, const char *ref_id)
 
 {
     TERMID t;
@@ -323,15 +334,16 @@ TERMID rset_term_create(const char *name, int length, const char *flags,
     else if (length == -1)
         t->name = nmem_strdup(nmem, name);
     else
-    {
-        t->name = (char*) nmem_malloc(nmem, length+1);
-        memcpy (t->name, name, length);
-        t->name[length] = '\0';
-    }
+	t->name = nmem_strdupn(nmem, name, length);
+    if (!ref_id)
+	t->ref_id = 0;
+    else
+	t->ref_id = nmem_strdup(nmem, ref_id);
     if (!flags)
         t->flags = NULL;
     else
         t->flags = nmem_strdup(nmem, flags);
+    t->hits_limit = hits_limit;
     t->type = type;
     t->reg_type = reg_type;
     t->rankpriv = 0;
@@ -346,8 +358,17 @@ int rset_default_read(RSFD rfd, void *buf, TERMID *term)
     int rc = (*rset->control->f_read)(rfd, buf, term);
     if (rc > 0)
     {
-	if (rfd->counted_items == 0 ||
-	    (rset->keycontrol->cmp)(buf, rfd->counted_buf) >= rset->scope)
+        int got_scope;
+        if (rfd->counted_items == 0)
+            got_scope = rset->scope+1;
+        else
+            got_scope = rset->keycontrol->cmp(buf, rfd->counted_buf);
+       
+#if 0
+        key_logdump_txt(YLOG_LOG, buf, "rset_default_read");
+        yaz_log(YLOG_LOG, "rset_scope=%d got_scope=%d", rset->scope, got_scope);
+#endif
+        if (got_scope > rset->scope)
 	{
 	    memcpy(rfd->counted_buf, buf, rset->keycontrol->key_size);
 	    rfd->counted_items++;
@@ -391,3 +412,11 @@ void rset_visit(RSET rset, int level)
 	rset_visit(rset->children[i], level+1);
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+