X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=6110d2cb27dc83785c61f217c13a3abeeae3bbcf;hb=5260b5390d8a1a36c66e52083e8ebb9d26b49f01;hp=21b0e79e0d93b78a1c5117309c2e6b7da50151d0;hpb=74eec9c27962c38e3a6f0983f78adf7e9d7de0eb;p=idzebra-moved-to-github.git

diff --git a/rset/rstemp.c b/rset/rstemp.c
index 21b0e79..6110d2c 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -1,10 +1,18 @@
 /*
- * Copyright (C) 1994-1997, Index Data I/S 
+ * Copyright (C) 1994-1998, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rstemp.c,v $
- * Revision 1.22  1997-10-31 12:38:12  adam
+ * Revision 1.24  1998-03-05 08:36:28  adam
+ * New result set model.
+ *
+ * Revision 1.23  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.22  1997/10/31 12:38:12  adam
  * Bug fix: added missing xfree() call.
  *
  * Revision 1.21  1997/09/17 12:19:23  adam
@@ -95,18 +103,16 @@
 #include <zebrautl.h>
 #include <rstemp.h>
 
-static void *r_create(const struct rset_control *sel, void *parms,
-                      int *flags);
+static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
 static RSFD r_open (RSET ct, int flag);
 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_read (RSFD rfd, void *buf);
+static int r_read (RSFD rfd, void *buf, int *term_index);
 static int r_write (RSFD rfd, const void *buf);
-static int r_score (RSFD rfd, int *score);
 
-static const rset_control control = 
+static const struct rset_control control = 
 {
     "temp",
     r_create,
@@ -117,10 +123,9 @@ static const rset_control control =
     r_count,
     r_read,
     r_write,
-    r_score
 };
 
-const rset_control *rset_kind_temp = &control;
+const struct rset_control *rset_kind_temp = &control;
 
 struct rset_temp_info {
     int     fd;
@@ -133,6 +138,7 @@ struct rset_temp_info {
     size_t  pos_buf;       /* position of first byte in window */
     size_t  pos_border;    /* position of last byte+1 in window */
     int     dirty;         /* window is dirty */
+    int     hits;          /* no of hits */
     char   *temp_path;
 };
 
@@ -141,7 +147,7 @@ struct rset_temp_rfd {
     struct rset_temp_rfd *next;
 };
 
-static void *r_create(const struct rset_control *sel, void *parms, int *flags)
+static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
 {
     rset_temp_parms *temp_parms = parms;
     struct rset_temp_info *info;
@@ -156,6 +162,7 @@ static void *r_create(const struct rset_control *sel, void *parms, int *flags)
     info->pos_end = 0;
     info->pos_buf = 0;
     info->dirty = 0;
+    info->hits = -1;
     if (!temp_parms->temp_path)
 	info->temp_path = NULL;
     else
@@ -163,7 +170,9 @@ static void *r_create(const struct rset_control *sel, void *parms, int *flags)
 	info->temp_path = xmalloc (strlen(temp_parms->temp_path)+1);
 	strcpy (info->temp_path, temp_parms->temp_path);
     }
-
+    ct->no_rset_terms = 1;
+    ct->rset_terms = xmalloc (sizeof(*ct->rset_terms));
+    ct->rset_terms[0] = temp_parms->rset_term;
     return info;
 }
 
@@ -267,6 +276,8 @@ static void r_delete (RSET ct)
     }
     if (info->temp_path)
 	xfree (info->temp_path);
+    rset_term_destroy (ct->rset_terms[0]);
+    xfree (ct->rset_terms);
     xfree (info);
 }
 
@@ -325,7 +336,7 @@ static int r_count (RSET ct)
     return info->pos_end / info->key_size;
 }
 
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, int *term_index)
 {
     struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
 
@@ -342,6 +353,7 @@ static int r_read (RSFD rfd, void *buf)
     memcpy (buf, info->buf_mem + (info->pos_cur - info->pos_buf),
             info->key_size);
     info->pos_cur = nc;
+    *term_index = 0;
     return 1;
 }
 
@@ -366,9 +378,3 @@ static int r_write (RSFD rfd, const void *buf)
         info->pos_border = info->pos_end = nc;
     return 1;
 }
-
-static int r_score (RSFD rfd, int *score)
-{
-    *score = -1;
-    return -1;
-}