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

diff --git a/rset/rstemp.c b/rset/rstemp.c
index 0c835f9..6a92d83 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rstemp.c,v $
- * Revision 1.7  1995-09-07 13:58:44  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.
@@ -66,14 +72,14 @@ const rset_control *rset_kind_temp = &control;
 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 {
@@ -88,7 +94,6 @@ static struct rset_control *r_create(const struct rset_control *sel,
     rset_temp_parms *temp_parms = parms;
     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_info));
@@ -131,6 +136,9 @@ static RSFD r_open (struct rset_control *ct, int wflag)
     return rfd;
 }
 
+/* r_flush:
+      flush current window to file if file is assocated with set
+ */
 static void r_flush (RSFD rfd, int mk)
 {
     struct rset_temp_info *info = ((struct rset_temp_rfd*) rfd)->info;
@@ -190,7 +198,6 @@ static void r_delete (struct rset_control *ct)
 {
     struct rset_temp_info *info = ct->buf;
 
-    r_close (ct);
     if (info->fname)
         unlink (info->fname);        
     free (info->buf_mem);
@@ -198,6 +205,10 @@ static void r_delete (struct rset_control *ct)
     free (info);
 }
 
+/* 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_info *info = ((struct rset_temp_rfd*)rfd)->info;
@@ -273,11 +284,13 @@ static int r_write (RSFD rfd, const void *buf)
         r_flush (rfd, 1);
         info->pos_buf = info->pos_cur;
         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;
 }