X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=c6a7dc9fe8ca3b6a04ce76fd4d7371e785479d2b;hb=af7bc27d33843a8e667022f24589450c39f907f2;hp=39456ef645e3dd36e10b0fd8f887360aa34d6763;hpb=c6bd2d13d0764bca640513f465b4ce3627081e28;p=idzebra-moved-to-github.git

diff --git a/rset/rstemp.c b/rset/rstemp.c
index 39456ef..c6a7dc9 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -4,7 +4,31 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rstemp.c,v $
- * Revision 1.12  1995-09-28 09:52:11  adam
+ * Revision 1.18  1996-10-29 13:54:52  adam
+ * Changed name of setting tempSetDir to setTmpDir.
+ *
+ * Revision 1.17  1995/12/11 09:15:28  adam
+ * New set types: sand/sor/snot - ranked versions of and/or/not in
+ * ranked/semi-ranked result sets.
+ * Note: the snot not finished yet.
+ * New rset member: flag.
+ * Bug fix: r_delete in rsrel.c did free bad memory block.
+ *
+ * Revision 1.16  1995/11/28  14:47:02  adam
+ * New setting: tempSetPath. Location of temporary result sets.
+ *
+ * Revision 1.15  1995/10/12  12:41:58  adam
+ * Private info (buf) moved from struct rset_control to struct rset.
+ * Bug fixes in relevance.
+ *
+ * Revision 1.14  1995/10/10  14:00:04  adam
+ * Function rset_open changed its wflag parameter to general flags.
+ *
+ * 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
@@ -50,22 +74,26 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include <alexutil.h>
+#include <zebrautl.h>
 #include <rstemp.h>
 
-static rset_control *r_create(const struct rset_control *sel, void *parms);
-static RSFD r_open (rset_control *ct, int wflag);
+static void *r_create(const struct rset_control *sel, void *parms,
+                      int *flags);
+static RSFD r_open (RSET ct, int flag);
 static void r_close (RSFD rfd);
-static void r_delete (rset_control *ct);
+static void r_delete (RSET ct);
 static void r_rewind (RSFD rfd);
-static int r_count (rset_control *ct);
+static int r_count (RSET 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 int temppath_init = 0;
+static char *temppath_root = NULL;
 
 static const rset_control control = 
 {
-    "Temporary set",
-    0,
+    "temp",
     r_create,
     r_open,
     r_close,
@@ -73,7 +101,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;
@@ -96,18 +125,12 @@ struct rset_temp_rfd {
     struct rset_temp_rfd *next;
 };
 
-static struct rset_control *r_create(const struct rset_control *sel,
-                                     void *parms)
+static void *r_create(const struct rset_control *sel, void *parms, int *flags)
 {
-    rset_control *newct;
     rset_temp_parms *temp_parms = parms;
     struct rset_temp_info *info;
-    
-    newct = xmalloc(sizeof(*newct));
-    memcpy(newct, sel, sizeof(*sel));
-    newct->buf = xmalloc (sizeof(struct rset_temp_info));
-    info = newct->buf;
-
+   
+    info = xmalloc (sizeof(struct rset_temp_info));
     info->fd = -1;
     info->fname = NULL;
     info->key_size = temp_parms->key_size;
@@ -118,10 +141,15 @@ static struct rset_control *r_create(const struct rset_control *sel,
     info->pos_buf = 0;
     info->dirty = 0;
 
-    return newct;
+    if (!temppath_init)
+    {
+        temppath_init = 1;
+        temppath_root = res_get (common_resource, "setTmpDir");
+    }
+    return info;
 }
 
-static RSFD r_open (struct rset_control *ct, int wflag)
+static RSFD r_open (RSET ct, int flag)
 {
     struct rset_temp_info *info = ct->buf;
     struct rset_temp_rfd *rfd;
@@ -129,7 +157,7 @@ static RSFD r_open (struct rset_control *ct, int wflag)
     assert (info->fd == -1);
     if (info->fname)
     {
-        if (wflag)
+        if (flag & RSETF_WRITE)
             info->fd = open (info->fname, O_RDWR|O_CREAT, 0666);
         else
             info->fd = open (info->fname, O_RDONLY);
@@ -154,7 +182,7 @@ static void r_flush (RSFD rfd, int mk)
 
     if (!info->fname && mk)
     {
-        char *s = (char*) tempnam (NULL, "zrs");
+        char *s = (char*) tempnam (temppath_root, "zrs");
 
         info->fname = xmalloc (strlen(s)+1);
         strcpy (info->fname, s);
@@ -204,7 +232,7 @@ static void r_close (RSFD rfd)
     }
 }
 
-static void r_delete (struct rset_control *ct)
+static void r_delete (RSET ct)
 {
     struct rset_temp_info *info = ct->buf;
 
@@ -269,7 +297,7 @@ static void r_rewind (RSFD rfd)
     r_reread (rfd);
 }
 
-static int r_count (struct rset_control *ct)
+static int r_count (RSET ct)
 {
     struct rset_temp_info *info = ct->buf;
 
@@ -318,3 +346,8 @@ static int r_write (RSFD rfd, const void *buf)
     return 1;
 }
 
+static int r_score (RSFD rfd, int *score)
+{
+    *score = -1;
+    return -1;
+}