X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=6a92d8371a1bb9057175a34cb881817242f654aa;hb=7c4f8bf9516beb806a1e51467d2e10f86a4c21b7;hp=d02cce5379b9c951eb5a532cdc279836321a0754;hpb=3039267ce9021611b94e5ddec8a7b1ecbacdd2fe;p=idzebra-moved-to-github.git

diff --git a/rset/rstemp.c b/rset/rstemp.c
index d02cce5..6a92d83 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -1,10 +1,24 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1995, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rstemp.c,v $
- * Revision 1.5  1995-09-05 16:36:59  adam
+ * Revision 1.9  1995-09-15 09:20:42  adam
+ * Bug fixes.
+ *
+ * Revision 1.8  1995/09/08  14:52:42  adam
+ * Work on relevance feedback.
+ *
+ * Revision 1.7  1995/09/07  13:58:44  adam
+ * New parameter: result-set file descriptor (RSFD) to support multiple
+ * positions within the same result-set.
+ * Boolean operators: and, or, not implemented.
+ *
+ * Revision 1.6  1995/09/06  16:11:56  adam
+ * More work on boolean sets.
+ *
+ * Revision 1.5  1995/09/05  16:36:59  adam
  * Minor changes.
  *
  * Revision 1.4  1995/09/05  11:43:24  adam
@@ -30,15 +44,14 @@
 #include <alexutil.h>
 #include <rstemp.h>
 
-static struct rset_control *r_create(const struct rset_control *sel, 
-                                     void *parms);
-static int r_open(struct rset_control *ct, int wflag);
-static void r_close(struct rset_control *ct);
-static void r_delete(struct rset_control *ct);
-static void r_rewind(struct rset_control *ct);
-static int r_count(struct rset_control *ct);
-static int r_read (rset_control *ct, void *buf);
-static int r_write (rset_control *ct, const void *buf);
+static rset_control *r_create(const struct rset_control *sel, void *parms);
+static RSFD r_open (rset_control *ct, int wflag);
+static void r_close (RSFD rfd);
+static void r_delete (rset_control *ct);
+static void r_rewind (RSFD rfd);
+static int r_count (rset_control *ct);
+static int r_read (RSFD rfd, void *buf);
+static int r_write (RSFD rfd, const void *buf);
 
 static const rset_control control = 
 {
@@ -56,17 +69,22 @@ static const rset_control control =
 
 const rset_control *rset_kind_temp = &control;
 
-struct rset_temp_private {
+struct rset_temp_info {
     int     fd;
     char   *fname;
-    size_t  key_size;
-    char   *buf_mem;
-    size_t  buf_size;
-    size_t  pos_end;
-    size_t  pos_cur;
-    size_t  pos_buf;
-    size_t  pos_border;
-    int     dirty;
+    size_t  key_size;      /* key size */
+    char   *buf_mem;       /* window buffer */
+    size_t  buf_size;      /* size of window */
+    size_t  pos_end;       /* last position in set */
+    size_t  pos_cur;       /* current position in set */
+    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 */
+};
+
+struct rset_temp_rfd {
+    struct rset_temp_info *info;
+    struct rset_temp_rfd *next;
 };
 
 static struct rset_control *r_create(const struct rset_control *sel,
@@ -74,12 +92,11 @@ static struct rset_control *r_create(const struct rset_control *sel,
 {
     rset_control *newct;
     rset_temp_parms *temp_parms = parms;
-    struct rset_temp_private *info;
+    struct rset_temp_info *info;
     
-    logf (LOG_DEBUG, "ritemp_create(%s)", sel->desc);
     newct = xmalloc(sizeof(*newct));
     memcpy(newct, sel, sizeof(*sel));
-    newct->buf = xmalloc (sizeof(struct rset_temp_private));
+    newct->buf = xmalloc (sizeof(struct rset_temp_info));
     info = newct->buf;
 
     info->fd = -1;
@@ -95,9 +112,10 @@ static struct rset_control *r_create(const struct rset_control *sel,
     return newct;
 }
 
-static int r_open(struct rset_control *ct, int wflag)
+static RSFD r_open (struct rset_control *ct, int wflag)
 {
-    struct rset_temp_private *info = ct->buf;
+    struct rset_temp_info *info = ct->buf;
+    struct rset_temp_rfd *rfd;
 
     assert (info->fd == -1);
     if (info->fname)
@@ -112,13 +130,18 @@ static int r_open(struct rset_control *ct, int wflag)
             exit (1);
         }
     }
+    rfd = xmalloc (sizeof(*rfd));
+    rfd->info = info;
     r_rewind (ct);
-    return 0;
+    return rfd;
 }
 
-static void r_flush (struct rset_control *ct, int mk)
+/* r_flush:
+      flush current window to file if file is assocated with set
+ */
+static void r_flush (RSFD rfd, int mk)
 {
-    struct rset_temp_private *info = ct->buf;
+    struct rset_temp_info *info = ((struct rset_temp_rfd*) rfd)->info;
 
     if (!info->fname && mk)
     {
@@ -159,11 +182,11 @@ static void r_flush (struct rset_control *ct, int mk)
     }
 }
 
-static void r_close (struct rset_control *ct)
+static void r_close (RSFD rfd)
 {
-    struct rset_temp_private *info = ct->buf;
+    struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
 
-    r_flush (ct, 0);
+    r_flush (rfd, 0);
     if (info->fname && info->fd != -1)
     {
         close (info->fd);
@@ -173,9 +196,8 @@ static void r_close (struct rset_control *ct)
 
 static void r_delete (struct rset_control *ct)
 {
-    struct rset_temp_private *info = ct->buf;
+    struct rset_temp_info *info = ct->buf;
 
-    r_close (ct);
     if (info->fname)
         unlink (info->fname);        
     free (info->buf_mem);
@@ -183,9 +205,13 @@ static void r_delete (struct rset_control *ct)
     free (info);
 }
 
-static void r_reread (struct rset_control *ct)
+/* r_reread:
+      read from file to window if file is assocated with set -
+      indicated by fname
+ */
+static void r_reread (RSFD rfd)
 {
-    struct rset_temp_private *info = ct->buf;
+    struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
 
     if (info->fname)
     {
@@ -210,35 +236,36 @@ static void r_reread (struct rset_control *ct)
         info->pos_border = info->pos_end;
 }
 
-static void r_rewind (struct rset_control *ct)
+static void r_rewind (RSFD rfd)
 {
-    struct rset_temp_private *info = ct->buf;
+    struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
 
-    r_flush (ct, 0);
+    r_flush (rfd, 0);
     info->pos_cur = 0;
     info->pos_buf = 0;
-    r_reread (ct);
+    r_reread (rfd);
 }
 
 static int r_count (struct rset_control *ct)
 {
-    struct rset_temp_private *info = ct->buf;
+    struct rset_temp_info *info = ct->buf;
 
     return info->pos_end / info->key_size;
 }
 
-static int r_read (rset_control *ct, void *buf)
+static int r_read (RSFD rfd, void *buf)
 {
-    struct rset_temp_private *info = ct->buf;
+    struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
+
     size_t nc = info->pos_cur + info->key_size;
 
     if (nc > info->pos_border)
     {
         if (nc > info->pos_end)
             return 0;
-        r_flush (ct, 0);
+        r_flush (rfd, 0);
         info->pos_buf = info->pos_cur;
-        r_reread (ct);
+        r_reread (rfd);
     }
     memcpy (buf, info->buf_mem + (info->pos_cur - info->pos_buf),
             info->key_size);
@@ -246,21 +273,24 @@ static int r_read (rset_control *ct, void *buf)
     return 1;
 }
 
-static int r_write (rset_control *ct, const void *buf)
+static int r_write (RSFD rfd, const void *buf)
 {
-    struct rset_temp_private *info = ct->buf;
+    struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info;
+
     size_t nc = info->pos_cur + info->key_size;
 
     if (nc > info->pos_buf + info->buf_size)
     {
-        r_flush (ct, 1);
+        r_flush (rfd, 1);
         info->pos_buf = info->pos_cur;
-        r_reread (ct);
+        r_reread (rfd);
+        info->dirty = 1;
     }
     memcpy (info->buf_mem + (info->pos_cur - info->pos_buf), buf,
             info->key_size);
-    info->dirty = 1;
-    info->pos_border = info->pos_cur = nc;
+    info->pos_cur = nc;
+    if (nc > info->pos_end)
+        info->pos_border = info->pos_end = nc;
     return 1;
 }