X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsm_or.c;h=a3a858bfc886d2f1a90fbd1775de1500337f89cc;hb=bad06dda453543b8dd716ee54e9b7cb2b015b6e5;hp=324118b8c666b202d3c157972e9ba75594fb371a;hpb=7f19b8bba3b3eb28130c34ed50fa56a6b3b374cd;p=idzebra-moved-to-github.git

diff --git a/rset/rsm_or.c b/rset/rsm_or.c
index 324118b..a3a858b 100644
--- a/rset/rsm_or.c
+++ b/rset/rsm_or.c
@@ -1,51 +1,37 @@
-/*
- * Copyright (C) 1994-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsm_or.c,v $
- * Revision 1.9  1999-07-13 14:45:42  adam
- * Fixed memory leak.
- *
- * Revision 1.8  1999/05/26 07:49:14  adam
- * C++ compilation.
- *
- * Revision 1.7  1998/09/22 10:03:46  adam
- * Changed result sets to be persistent in the sense that they can
- * be re-searched if needed.
- * Fixed memory leak in rsm_or.
- *
- * Revision 1.6  1998/03/05 08:36:28  adam
- * New result set model.
- *
- * Revision 1.5  1997/12/18 10:54:25  adam
- * New method result set method rs_hits that returns the number of
- * hits in result-set (if known). The ranked result set returns real
- * number of hits but only when not combined with other operands.
- *
- * Revision 1.4  1997/10/31 12:37:55  adam
- * Code calls xfree() instead of free().
- *
- * Revision 1.3  1997/09/09 13:38:16  adam
- * Partial port to WIN95/NT.
- *
- * Revision 1.2  1996/12/23 15:30:49  adam
- * Work on truncation.
- *
- * Revision 1.1  1996/12/20 11:07:21  adam
- * Implemented Multi-or result set.
- *
- */
+/* $Id: rsm_or.c,v 1.13 2002-08-02 19:26:57 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+
+
 
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include <zebrautl.h>
 #include <isam.h>
 #include <isamc.h>
 #include <rsm_or.h>
-#include <zebrautl.h>
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
 static RSFD r_open (RSET ct, int flag);
@@ -103,6 +89,8 @@ struct rset_mor_rfd {
     struct rset_mor_rfd *next;
     struct rset_mor_info *info;
     struct trunc_info *ti;
+    int  *countp;
+    char *pbuf;
 };
 
 static void heap_swap (struct trunc_info *ti, int i1, int i2)
@@ -254,6 +242,13 @@ static RSFD r_open (RSET ct, int flag)
         }
     }
     rfd->position = info->no_save_positions;
+
+    if (ct->no_rset_terms == 1)
+        rfd->countp = &ct->rset_terms[0]->count;
+    else
+        rfd->countp = 0;
+    rfd->pbuf = xmalloc (info->key_size);
+
     r_rewind (rfd);
     return rfd;
 }
@@ -274,6 +269,7 @@ static void r_close (RSFD rfd)
                 if (((struct rset_mor_rfd *) rfd)->ispt[i])
                     isc_pp_close (((struct rset_mor_rfd *) rfd)->ispt[i]);
             xfree (((struct rset_mor_rfd *)rfd)->ispt);
+            xfree (((struct rset_mor_rfd *)rfd)->pbuf);
             xfree (rfd);
             return;
         }
@@ -307,7 +303,8 @@ static int r_count (RSET ct)
 
 static int r_read (RSFD rfd, void *buf, int *term_index)
 {
-    struct trunc_info *ti = ((struct rset_mor_rfd *) rfd)->ti;
+    struct rset_mor_rfd *mrfd = (struct rset_mor_rfd *) rfd;
+    struct trunc_info *ti = mrfd->ti;
     int n = ti->indx[ti->ptr[1]];
 
     if (!ti->heapnum)
@@ -325,6 +322,12 @@ static int r_read (RSFD rfd, void *buf, int *term_index)
         }
         else
             heap_delete (ti);
+        if (mrfd->countp && (
+                *mrfd->countp == 0 || (*ti->cmp)(buf, mrfd->pbuf) > 1))
+        {
+            memcpy (mrfd->pbuf, buf, ti->keysize);
+            (*mrfd->countp)++;
+        }
         return 1;
     }
     while (1)
@@ -341,6 +344,12 @@ static int r_read (RSFD rfd, void *buf, int *term_index)
             break;
         }
     }
+    if (mrfd->countp && (
+            *mrfd->countp == 0 || (*ti->cmp)(buf, mrfd->pbuf) > 1))
+    {
+        memcpy (mrfd->pbuf, buf, ti->keysize);
+        (*mrfd->countp)++;
+    }
     return 1;
 }