X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=c6a7dc9fe8ca3b6a04ce76fd4d7371e785479d2b;hb=82bdd90d99e036b5c491666b5be5471c59f8e1b8;hp=fafc90862a8b61cbf0111214f0d824e71e9ea9a1;hpb=5c7ad71f534d092eaf97f04dd39c5e874e0d45b0;p=idzebra-moved-to-github.git

diff --git a/rset/rstemp.c b/rset/rstemp.c
index fafc908..c6a7dc9 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -4,7 +4,20 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rstemp.c,v $
- * Revision 1.15  1995-10-12 12:41:58  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.
  *
@@ -61,10 +74,11 @@
 #include <sys/types.h>
 #include <stdio.h>
 
-#include <alexutil.h>
+#include <zebrautl.h>
 #include <rstemp.h>
 
-static void *r_create(const struct rset_control *sel, void *parms);
+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 ct);
@@ -74,9 +88,12 @@ 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",
+    "temp",
     r_create,
     r_open,
     r_close,
@@ -108,11 +125,11 @@ struct rset_temp_rfd {
     struct rset_temp_rfd *next;
 };
 
-static void *r_create(const struct rset_control *sel, void *parms)
+static void *r_create(const struct rset_control *sel, void *parms, int *flags)
 {
     rset_temp_parms *temp_parms = parms;
     struct rset_temp_info *info;
-    
+   
     info = xmalloc (sizeof(struct rset_temp_info));
     info->fd = -1;
     info->fname = NULL;
@@ -124,6 +141,11 @@ static void *r_create(const struct rset_control *sel, void *parms)
     info->pos_buf = 0;
     info->dirty = 0;
 
+    if (!temppath_init)
+    {
+        temppath_init = 1;
+        temppath_root = res_get (common_resource, "setTmpDir");
+    }
     return info;
 }
 
@@ -160,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);