X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frstemp.c;h=b260c49651e03f6e2f830d2a746f78c5bd8fb9f7;hp=c4b1b03991c7fce9e62ab6e667e20cdcfb09d32b;hb=a030c87bc444608639905eca95e29f84a4f1d991;hpb=0e898c0c6183c6dd9701286f6a4ac9b734c9bdbb

diff --git a/rset/rstemp.c b/rset/rstemp.c
index c4b1b03..b260c49 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -1,8 +1,5 @@
-/* $Id: rstemp.c,v 1.63 2005-05-03 09:11:36 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,9 +12,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <assert.h>
@@ -27,7 +24,8 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 #ifdef WIN32
 #include <io.h>
-#else
+#endif
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <sys/types.h>
@@ -51,7 +49,7 @@ static const struct rset_control control =
     rset_get_one_term,
     r_open,
     r_close,
-    rset_default_forward,
+    0, /* no forward */
     r_pos, 
     r_read,
     r_write,
@@ -80,10 +78,11 @@ struct rfd_private {
 static int log_level = 0;
 static int log_level_initialized = 0;
 
-RSET rstemp_create(NMEM nmem, struct rset_key_control *kcontrol,
-                   int scope, const char *temp_path, TERMID term)
+RSET rset_create_temp(NMEM nmem, struct rset_key_control *kcontrol,
+                      int scope, const char *temp_path, TERMID term)
 {
-    RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term);
+    RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term,
+				 0, 0);
     struct rset_private *info;
     if (!log_level_initialized)
     {
@@ -135,7 +134,7 @@ static RSFD r_open(RSET ct, int flag)
         if (info->fd == -1)
         {
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open failed %s", info->fname);
-            exit(1);
+            zebra_exit("r_open");
         }
     }
     rfd = rfd_create_base(ct);
@@ -166,17 +165,22 @@ static void r_flush(RSFD rfd, int mk)
     {
 #if HAVE_MKSTEMP
         char template[1024];
+
+        *template = '\0';
+
         if (info->temp_path)
-            sprintf(template, "%s/zrsXXXXXX", info->temp_path);
-        else
-            sprintf(template, "zrsXXXXXX");
+            sprintf(template, "%s/", info->temp_path);
+        strcat(template, "zrs_");
+#if HAVE_UNISTD_H
+        sprintf(template + strlen(template), "%ld_", (long) getpid());
+#endif
+        strcat(template, "XXXXXX");
 
         info->fd = mkstemp(template);
-
         if (info->fd == -1)
         {
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: mkstemp %s", template);
-            exit(1);
+            zebra_exit("r_flush");
         }
 	info->fname = nmem_strdup(rfd->rset->nmem, template);
 #else
@@ -188,7 +192,7 @@ static void r_flush(RSFD rfd, int mk)
         if (info->fd == -1)
         {
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open %s", info->fname);
-            exit(1);
+            zebra_exit("r_flush");
         }
 #endif
     }
@@ -200,7 +204,7 @@ static void r_flush(RSFD rfd, int mk)
         if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1)
         {
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (1) %s", info->fname);
-            exit(1);
+            zebra_exit("r_flusxh");
         }
         count = info->buf_size;
         if (count > info->pos_end - info->pos_buf)
@@ -212,7 +216,7 @@ static void r_flush(RSFD rfd, int mk)
             else
                 yaz_log(YLOG_FATAL, "rstemp: write of %ld but got %ld",
                       (long) count, (long) r);
-            exit(1);
+            zebra_exit("r_flush");
         }
         info->dirty = 0;
     }
@@ -230,7 +234,6 @@ static void r_close(RSFD rfd)
 	    info->fd = -1;
 	}
     }
-    rfd_delete_base(rfd);
 }
 
 
@@ -258,7 +261,7 @@ static void r_reread(RSFD rfd)
             if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1)
             {
                 yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (2) %s fd=%d", info->fname, info->fd);
-                exit(1);
+                zebra_exit("r_reread");
             }
             if ((r = read(info->fd, info->buf_mem, count)) < (int) count)
             {
@@ -267,7 +270,7 @@ static void r_reread(RSFD rfd)
                 else
                     yaz_log(YLOG_FATAL, "read of %ld but got %ld",
                           (long) count, (long) r);
-                exit(1);
+                zebra_exit("r_reread");
             }
         }
     }
@@ -332,3 +335,12 @@ static void r_pos(RSFD rfd, double  *current, double  *total)
     *current = (double) mrfd->cur;
     *total = (double) info->hits;
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+