X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=rset%2Frstemp.c;h=2103959c5355bb2fc2295288c46c6ce6031ed1b5;hb=40ca1d08c1d83b92e0b90951d918b252c61c63b2;hp=6a92d8371a1bb9057175a34cb881817242f654aa;hpb=7c4f8bf9516beb806a1e51467d2e10f86a4c21b7;p=idzebra-moved-to-github.git

diff --git a/rset/rstemp.c b/rset/rstemp.c
index 6a92d83..2103959 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -4,7 +4,20 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rstemp.c,v $
- * Revision 1.9  1995-09-15 09:20:42  adam
+ * Revision 1.13  1995-10-06 14:38:06  adam
+ * New result set method: r_score.
+ * Local no (sysno) and score is transferred to retrieveCtrl.
+ *
+ * Revision 1.12  1995/09/28  09:52:11  adam
+ * xfree/xmalloc used everywhere.
+ *
+ * Revision 1.11  1995/09/18  14:17:56  adam
+ * Bug fixes.
+ *
+ * Revision 1.10  1995/09/15  14:45:39  adam
+ * Bug fixes.
+ *
+ * Revision 1.9  1995/09/15  09:20:42  adam
  * Bug fixes.
  *
  * Revision 1.8  1995/09/08  14:52:42  adam
@@ -52,6 +65,7 @@ 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 int r_score (RSFD rfd, int *score);
 
 static const rset_control control = 
 {
@@ -64,7 +78,8 @@ static const rset_control control =
     r_rewind,
     r_count,
     r_read,
-    r_write
+    r_write,
+    r_score
 };
 
 const rset_control *rset_kind_temp = &control;
@@ -102,7 +117,7 @@ static struct rset_control *r_create(const struct rset_control *sel,
     info->fd = -1;
     info->fname = NULL;
     info->key_size = temp_parms->key_size;
-    info->buf_size = 1024;
+    info->buf_size = 4096;
     info->buf_mem = xmalloc (info->buf_size);
     info->pos_cur = 0;
     info->pos_end = 0;
@@ -132,7 +147,7 @@ static RSFD r_open (struct rset_control *ct, int wflag)
     }
     rfd = xmalloc (sizeof(*rfd));
     rfd->info = info;
-    r_rewind (ct);
+    r_rewind (rfd);
     return rfd;
 }
 
@@ -150,6 +165,7 @@ static void r_flush (RSFD rfd, int mk)
         info->fname = xmalloc (strlen(s)+1);
         strcpy (info->fname, s);
 
+        logf (LOG_DEBUG, "creating tempfile %s", info->fname);
         info->fd = open (info->fname, O_RDWR|O_CREAT, 0666);
         if (info->fd == -1)
         {
@@ -201,7 +217,13 @@ static void r_delete (struct rset_control *ct)
     if (info->fname)
         unlink (info->fname);        
     free (info->buf_mem);
-    free (info->fname);
+    logf (LOG_DEBUG, "r_delete: set size %ld", (long) info->pos_end);
+    if (info->fname)
+    {
+        logf (LOG_DEBUG, "r_delete: unlink %s", info->fname);
+        unlink (info->fname);
+        free (info->fname);
+    }
     free (info);
 }
 
@@ -222,6 +244,12 @@ static void r_reread (RSFD rfd)
             info->pos_border = info->pos_end;
         count = info->pos_border - info->pos_buf;
         if (count > 0)
+        {
+            if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
+            {
+                logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname);
+                exit (1);
+            }
             if ((r = read (info->fd, info->buf_mem, count)) < count)
             {
                 if (r == -1)
@@ -231,6 +259,7 @@ static void r_reread (RSFD rfd)
                           (long) count, (long) r);
                 exit (1);
             }
+        }
     }
     else
         info->pos_border = info->pos_end;
@@ -283,9 +312,10 @@ 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;
+        if (info->pos_buf < info->pos_end)
+            r_reread (rfd);
     }
+    info->dirty = 1;
     memcpy (info->buf_mem + (info->pos_cur - info->pos_buf), buf,
             info->key_size);
     info->pos_cur = nc;
@@ -294,3 +324,8 @@ static int r_write (RSFD rfd, const void *buf)
     return 1;
 }
 
+static int r_score (RSFD rfd, int *score)
+{
+    *score = -1;
+    return -1;
+}