X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=2103959c5355bb2fc2295288c46c6ce6031ed1b5;hb=40ca1d08c1d83b92e0b90951d918b252c61c63b2;hp=10412c4fd32c511d95d08591b5b91af04069f626;hpb=42b0747acfaaf94e94fd6c20b4cd97e10ded0ae0;p=idzebra-moved-to-github.git

diff --git a/rset/rstemp.c b/rset/rstemp.c
index 10412c4..2103959 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -4,7 +4,31 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rstemp.c,v $
- * Revision 1.6  1995-09-06 16:11:56  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
+ * 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
@@ -33,15 +57,15 @@
 #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 int r_score (RSFD rfd, int *score);
 
 static const rset_control control = 
 {
@@ -54,22 +78,28 @@ static const rset_control control =
     r_rewind,
     r_count,
     r_read,
-    r_write
+    r_write,
+    r_score
 };
 
 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,
@@ -77,18 +107,17 @@ 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;
     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;
@@ -98,9 +127,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)
@@ -115,13 +145,18 @@ static int r_open(struct rset_control *ct, int wflag)
             exit (1);
         }
     }
-    r_rewind (ct);
-    return 0;
+    rfd = xmalloc (sizeof(*rfd));
+    rfd->info = info;
+    r_rewind (rfd);
+    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)
     {
@@ -130,6 +165,7 @@ static void r_flush (struct rset_control *ct, 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)
         {
@@ -162,11 +198,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);
@@ -176,19 +212,28 @@ 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);
-    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);
 }
 
-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)
     {
@@ -199,6 +244,12 @@ static void r_reread (struct rset_control *ct)
             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)
@@ -208,40 +259,42 @@ static void r_reread (struct rset_control *ct)
                           (long) count, (long) r);
                 exit (1);
             }
+        }
     }
     else
         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);
@@ -249,21 +302,30 @@ 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);
+        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->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;
 }
 
+static int r_score (RSFD rfd, int *score)
+{
+    *score = -1;
+    return -1;
+}