X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=rset%2Frsm_or.c;h=aa61ba34efce632859dfdc336c851fc7fffbe301;hb=3db15cf883ad80b6a4b0e960f3c3b59c86b59c6b;hp=e8b004733acc4f40a7c5c3efa380170272cbe5fd;hpb=5d20c4e9f612a012313370c82dc8481b9f19d5df;p=idzebra-moved-to-github.git

diff --git a/rset/rsm_or.c b/rset/rsm_or.c
index e8b0047..aa61ba3 100644
--- a/rset/rsm_or.c
+++ b/rset/rsm_or.c
@@ -4,14 +4,29 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsm_or.c,v $
- * Revision 1.1  1996-12-20 11:07:21  adam
+ * 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.
  *
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
+#include <string.h>
 
 #include <isam.h>
 #include <isamc.h>
@@ -25,6 +40,7 @@ static void r_close (RSFD rfd);
 static void r_delete (RSET ct);
 static void r_rewind (RSFD rfd);
 static int r_count (RSET ct);
+static int r_hits (RSET ct, void *oi);
 static int r_read (RSFD rfd, void *buf);
 static int r_write (RSFD rfd, const void *buf);
 static int r_score (RSFD rfd, int *score);
@@ -38,6 +54,7 @@ static const rset_control control =
     r_delete,
     r_rewind,
     r_count,
+    r_hits,
     r_read,
     r_write,
     r_score
@@ -53,6 +70,7 @@ struct rset_mor_info {
     ISAM_P  *isam_positions;
 
     int     no_isam_positions;
+    int     no_save_positions;
     struct rset_mor_rfd *rfd_list;
 };
 
@@ -70,6 +88,8 @@ struct trunc_info {
 
 struct rset_mor_rfd {
     int flag;
+    int position;
+    int position_max;
     ISAMC_PP *ispt;
     struct rset_mor_rfd *next;
     struct rset_mor_info *info;
@@ -171,6 +191,8 @@ static void *r_create (const struct rset_control *sel, void *parms,
     info->key_size = r_parms->key_size;
     assert (info->key_size > 1);
     info->cmp = r_parms->cmp;
+    
+    info->no_save_positions = r_parms->no_save_positions;
 
     info->isc = r_parms->isc;
     info->no_isam_positions = r_parms->no_isam_positions;
@@ -215,6 +237,7 @@ static RSFD r_open (RSET ct, int flag)
             rfd->ispt[i] = NULL;
         }
     }
+    rfd->position = info->no_save_positions;
     r_rewind (rfd);
     return rfd;
 }
@@ -234,8 +257,8 @@ static void r_close (RSFD rfd)
             for (i = 0; i<info->no_isam_positions; i++)
                 if (((struct rset_mor_rfd *) rfd)->ispt[i])
                     isc_pp_close (((struct rset_mor_rfd *) rfd)->ispt[i]);
-            free (((struct rset_mor_rfd *)rfd)->ispt);
-            free (rfd);
+            xfree (((struct rset_mor_rfd *)rfd)->ispt);
+            xfree (rfd);
             return;
         }
     logf (LOG_FATAL, "r_close but no rfd match!");
@@ -260,6 +283,11 @@ static int r_count (RSET ct)
     return 0;
 }
 
+static int r_hits (RSET ct, void *oi)
+{
+    return -1;
+}
+
 static int r_read (RSFD rfd, void *buf)
 {
     struct trunc_info *ti = ((struct rset_mor_rfd *) rfd)->ti;
@@ -268,13 +296,32 @@ static int r_read (RSFD rfd, void *buf)
     if (!ti->heapnum)
         return 0;
     memcpy (buf, ti->heap[ti->ptr[1]], ti->keysize);
-    heap_delete (ti);
-    if (isc_pp_read (((struct rset_mor_rfd *) rfd)->ispt[n], ti->tmpbuf))
-        heap_insert (ti, ti->tmpbuf, n);
-    else
+    if (((struct rset_mor_rfd *) rfd)->position)
     {
-        isc_pp_close (((struct rset_mor_rfd *) rfd)->ispt[n]);
-        ((struct rset_mor_rfd*) rfd)->ispt[n] = NULL;
+        if (isc_pp_read (((struct rset_mor_rfd *) rfd)->ispt[n], ti->tmpbuf))
+        {
+            heap_delete (ti);
+            if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1)
+                 ((struct rset_mor_rfd *) rfd)->position--;
+            heap_insert (ti, ti->tmpbuf, n);
+        }
+        else
+            heap_delete (ti);
+        return 1;
+    }
+    while (1)
+    {
+        if (!isc_pp_read (((struct rset_mor_rfd *) rfd)->ispt[n], ti->tmpbuf))
+        {
+            heap_delete (ti);
+            break;
+        }
+        if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1)
+        {
+            heap_delete (ti);
+            heap_insert (ti, ti->tmpbuf, n);
+            break;
+        }
     }
     return 1;
 }