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

diff --git a/rset/rset.c b/rset/rset.c
index e6cb176..ae5abae 100644
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,8 +1,5 @@
-/* $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.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2009 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -65,19 +62,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 +137,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);
 }
 
 /**
@@ -261,7 +269,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;
 }
 
@@ -307,6 +315,11 @@ struct ord_list *ord_list_dup(NMEM nmem, struct ord_list *list)
     return n;
 }
 
+void ord_list_print(struct ord_list *list)
+{
+    for (; list; list = list->next)
+        yaz_log(YLOG_LOG, "ord_list %d", list->ord);
+}
 /**
    \brief Creates a TERMID entry.
    \param name Term/Name buffer with given length