X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=rset%2Frstemp.c;h=fe300448237a5219b263f09a4dfba5f89ece7782;hb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;hp=f43e5e2383179c68f837148b4da9716b4457ab13;hpb=221024eb6b10e45d6479bb4154dd7de7fca1d477;p=idzebra-moved-to-github.git

diff --git a/rset/rstemp.c b/rset/rstemp.c
index f43e5e2..fe30044 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -1,10 +1,19 @@
 /*
- * Copyright (C) 1994-1997, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rstemp.c,v $
- * Revision 1.23  1997-12-18 10:54:25  adam
+ * Revision 1.26  1999-05-26 07:49:14  adam
+ * C++ compilation.
+ *
+ * Revision 1.25  1999/02/02 14:51:37  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * 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.
@@ -88,7 +97,7 @@
 
 #include <fcntl.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -100,19 +109,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_hits (RSET ct, void *oi);
-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,
@@ -121,13 +127,11 @@ static const rset_control control =
     r_delete,
     r_rewind,
     r_count,
-    r_hits,
     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;
@@ -149,17 +153,17 @@ 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;
+    rset_temp_parms *temp_parms = (rset_temp_parms *) parms;
     struct rset_temp_info *info;
    
-    info = xmalloc (sizeof(struct rset_temp_info));
+    info = (struct rset_temp_info *) xmalloc (sizeof(struct rset_temp_info));
     info->fd = -1;
     info->fname = NULL;
     info->key_size = temp_parms->key_size;
     info->buf_size = 4096;
-    info->buf_mem = xmalloc (info->buf_size);
+    info->buf_mem = (char *) xmalloc (info->buf_size);
     info->pos_cur = 0;
     info->pos_end = 0;
     info->pos_buf = 0;
@@ -169,16 +173,18 @@ static void *r_create(const struct rset_control *sel, void *parms, int *flags)
 	info->temp_path = NULL;
     else
     {
-	info->temp_path = xmalloc (strlen(temp_parms->temp_path)+1);
+	info->temp_path = (char *) xmalloc (strlen(temp_parms->temp_path)+1);
 	strcpy (info->temp_path, temp_parms->temp_path);
     }
-
+    ct->no_rset_terms = 1;
+    ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
+    ct->rset_terms[0] = temp_parms->rset_term;
     return info;
 }
 
 static RSFD r_open (RSET ct, int flag)
 {
-    struct rset_temp_info *info = ct->buf;
+    struct rset_temp_info *info = (struct rset_temp_info *) ct->buf;
     struct rset_temp_rfd *rfd;
 
     assert (info->fd == -1);
@@ -194,7 +200,7 @@ static RSFD r_open (RSET ct, int flag)
             exit (1);
         }
     }
-    rfd = xmalloc (sizeof(*rfd));
+    rfd = (struct rset_temp_rfd *) xmalloc (sizeof(*rfd));
     rfd->info = info;
     r_rewind (rfd);
     return rfd;
@@ -211,7 +217,7 @@ static void r_flush (RSFD rfd, int mk)
     {
         char *s = (char*) tempnam (info->temp_path, "zrs");
 
-        info->fname = xmalloc (strlen(s)+1);
+        info->fname = (char *) xmalloc (strlen(s)+1);
         strcpy (info->fname, s);
 
         logf (LOG_DEBUG, "creating tempfile %s", info->fname);
@@ -224,7 +230,8 @@ static void r_flush (RSFD rfd, int mk)
     }
     if (info->fname && info->fd != -1 && info->dirty)
     {
-        size_t r, count;
+        size_t count;
+	int r;
         
         if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
         {
@@ -234,7 +241,7 @@ static void r_flush (RSFD rfd, int mk)
         count = info->buf_size;
         if (count > info->pos_end - info->pos_buf)
             count = info->pos_end - info->pos_buf;
-        if ((r = write (info->fd, info->buf_mem, count)) < count)
+        if ((r = write (info->fd, info->buf_mem, count)) < (int) count)
         {
             if (r == -1)
                 logf (LOG_FATAL|LOG_ERRNO, "read %s", info->fname);
@@ -262,7 +269,7 @@ static void r_close (RSFD rfd)
 
 static void r_delete (RSET ct)
 {
-    struct rset_temp_info *info = ct->buf;
+    struct rset_temp_info *info = (struct rset_temp_info*) ct->buf;
 
     if (info->fname)
         unlink (info->fname);        
@@ -276,6 +283,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);
 }
 
@@ -289,7 +298,8 @@ static void r_reread (RSFD rfd)
 
     if (info->fname)
     {
-        size_t r, count;
+        size_t count;
+	int r;
 
         info->pos_border = info->pos_cur + info->buf_size;
         if (info->pos_border > info->pos_end)
@@ -302,7 +312,7 @@ static void r_reread (RSFD rfd)
                 logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname);
                 exit (1);
             }
-            if ((r = read (info->fd, info->buf_mem, count)) < count)
+            if ((r = read (info->fd, info->buf_mem, count)) < (int) count)
             {
                 if (r == -1)
                     logf (LOG_FATAL|LOG_ERRNO, "read %s", info->fname);
@@ -329,19 +339,12 @@ static void r_rewind (RSFD rfd)
 
 static int r_count (RSET ct)
 {
-    struct rset_temp_info *info = ct->buf;
+    struct rset_temp_info *info = (struct rset_temp_info *) ct->buf;
 
     return info->pos_end / info->key_size;
 }
 
-static int r_hits (RSET ct, void *oi)
-{
-    struct rset_temp_info *info = ct->buf;
-
-    return info->hits;
-}
-
-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;
 
@@ -358,6 +361,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;
 }
 
@@ -382,9 +386,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;
-}