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

diff --git a/rset/rstemp.c b/rset/rstemp.c
index 2103959..5eb0db9 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -4,7 +4,17 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rstemp.c,v $
- * Revision 1.13  1995-10-06 14:38:06  adam
+ * 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.
  *
@@ -57,20 +67,22 @@
 #include <alexutil.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);
+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,
     r_create,
     r_open,
     r_close,
@@ -102,18 +114,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)
 {
-    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;
@@ -124,10 +130,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, "tempSetPath");
+    }
+    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;
@@ -135,7 +146,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);
@@ -160,7 +171,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);
@@ -210,7 +221,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;
 
@@ -275,7 +286,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;