X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frset.c;h=52377bb668f87fefceee20b7cb49ef9ab9c5e3ec;hb=658e913f7bdebe46f428d58914951ed19d193e2f;hp=ef3696d024ccb0b351c9b4f2baf024aaa4b81ac0;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;p=idzebra-moved-to-github.git

diff --git a/rset/rset.c b/rset/rset.c
index ef3696d..52377bb 100644
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,5 +1,5 @@
-/* $Id: rset.c,v 1.53 2006-05-10 08:13:33 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: rset.c,v 1.58 2007-01-17 15:35:48 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>
@@ -65,19 +65,43 @@ RSFD rfd_create_base(RSET rs)
     return rnew;
 }
 
+static void rset_close_int(RSET rs, RSFD rfd)
+{
+    RSFD *pfd;
+    (*rs->control->f_close)(rfd);
+    
+    yaz_log(log_level, "rfd_delete_base: rfd=%p rs=%p priv=%p fl=%p",
+            rfd, rs, rfd->priv, rs->free_list); 
+    for (pfd = &rs->use_list; *pfd; pfd = &(*pfd)->next)
+	if (*pfd == rfd)
+	{
+	    *pfd = (*pfd)->next;
+	    rfd->next = rs->free_list;
+	    rs->free_list = rfd;
+	    return;
+	}
+    yaz_log(YLOG_WARN, "rset_close handle not found. type=%s",
+	    rs->control->desc);
+}
+
+void rset_set_hits_limit(RSET rs, zint l)
+{
+    rs->hits_limit = l;
+}
+
 /**
    \brief Closes a result set RFD handle
    \param rfd the RFD handle.
 */
 void rset_close(RSFD rfd)
 {
-    RSFD *pfd;
     RSET rs = rfd->rset;
 
     if (rs->hits_count == 0)
     {
 	TERMID termid;
 	char buf[100];
+
 	while(rfd->counted_items <= rs->hits_limit
 	      && rset_default_read(rfd, buf, &termid))
 	    ;
@@ -116,20 +140,7 @@ void rset_close(RSFD rfd)
 	yaz_log(log_level, "rset_close p=%p count=" ZINT_FORMAT, rs,
 		rs->hits_count);
     }
-    (*rs->control->f_close)(rfd);
-    
-    yaz_log(log_level, "rfd_delete_base: rfd=%p rs=%p priv=%p fl=%p",
-            rfd, rs, rfd->priv, rs->free_list); 
-    for (pfd = &rs->use_list; *pfd; pfd = &(*pfd)->next)
-	if (*pfd == rfd)
-	{
-	    *pfd = (*pfd)->next;
-	    rfd->next = rs->free_list;
-	    rs->free_list = rfd;
-	    return;
-	}
-    yaz_log(YLOG_WARN, "rset_close handle not found. type=%s",
-	    rs->control->desc);
+    rset_close_int(rs, rfd);
 }
 
 /**
@@ -175,6 +186,7 @@ RSET rset_create_base(const struct rset_control *sel,
     rset->hits_limit = 0;
     rset->hits_round = 1000;
     rset->keycontrol = kcontrol;
+
     (*kcontrol->inc)(kcontrol);
     rset->scope = scope;
     rset->term = term;
@@ -243,7 +255,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;
 }
 
@@ -261,7 +272,7 @@ zint rset_count(RSET rs)
     double cur, tot;
     RSFD rfd = rset_open(rs, 0);
     rset_pos(rfd, &cur, &tot);
-    rset_close(rfd);
+    rset_close_int(rs, rfd);
     return (zint) tot;
 }
 
@@ -358,8 +369,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++;