X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=rset%2Frsprox.c;h=dc70fd6b9edfeac2387c1390155fd1d9600634ca;hb=668b136879471079ce03b26981a5fd1b3a210bc1;hp=909049595b1e07a42483dd4a7427cf433e52b6e0;hpb=70ba74c9bbf739fbe82d1bc2b0fb64a547c0c9e0;p=idzebra-moved-to-github.git

diff --git a/rset/rsprox.c b/rset/rsprox.c
index 9090495..dc70fd6 100644
--- a/rset/rsprox.c
+++ b/rset/rsprox.c
@@ -1,4 +1,4 @@
-/* $Id: rsprox.c,v 1.5 2004-08-03 14:54:41 heikki Exp $
+/* $Id: rsprox.c,v 1.5.2.2 2006-08-14 10:39:20 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -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>
@@ -71,6 +71,8 @@ struct rset_prox_rfd {
     char *more;  /* more in each lookahead? */
     struct rset_prox_rfd *next;
     struct rset_prox_info *info;
+    int  *countp;
+    char *pbuf;
 };    
 
 static void *r_create (RSET ct, const struct rset_control *sel, void *parms)
@@ -126,6 +128,7 @@ static void *r_create (RSET ct, const struct rset_control *sel, void *parms)
 
     ct->rset_terms[0] = rset_term_create (prox_term, length_prox_term,
 					  flags, term_type);
+
     return info;
 }
 
@@ -159,6 +162,9 @@ static RSFD r_open (RSET ct, int flag)
     for (i = 0; i < info->p.rset_no; i++)
 	rfd->more[i] = rset_read (info->p.rset[i], rfd->rfd[i],
 				  rfd->buf[i], &dummy);
+
+    rfd->countp = &ct->rset_terms[0]->count;
+    rfd->pbuf = xmalloc (info->p.key_size);
     return rfd;
 }
 
@@ -176,6 +182,8 @@ static void r_close (RSFD rfd)
 	    xfree ((*rfdp)->buf);
             xfree ((*rfdp)->more);
 
+            xfree ((*rfdp)->pbuf);
+
 	    for (i = 0; i<info->p.rset_no; i++)
 		rset_close (info->p.rset[i], (*rfdp)->rfd[i]);
 	    xfree ((*rfdp)->rfd);
@@ -286,6 +294,13 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index,
 		
 		p->more[0] = rset_read (info->p.rset[0], p->rfd[0],
 					p->buf[0], &dummy);
+
+		if (p->countp && (
+			*p->countp == 0 || (*info->p.cmp)(buf, p->pbuf) > 1))
+		{
+		    memcpy (p->pbuf, buf, info->p.key_size);
+		    (*p->countp)++;
+		}
 		return 1;
 	    }
 	}