WS updates. Fix rstemp file open

[idzebra-moved-to-github.git] / rset / rstemp.c

diff --git a/rset/rstemp.c b/rset/rstemp.c
index 621addf..99c4543 100644 (file)
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -1,6 +1,6 @@
-/* $Id: rstemp.c,v 1.52 2004-10-22 10:12:52 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
-   Index Data Aps
+/* $Id: rstemp.c,v 1.59 2005-01-17 00:01:51 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,16 +20,17 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-#include <fcntl.h>
 #include <assert.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
 #endif
-#include <string.h>
 #include <sys/types.h>
-#include <stdio.h>
 
 #include <zebrautl.h>
 #include <rset.h>
@@ -48,7 +49,7 @@ static const struct rset_control control =
 {
     "temp",
     r_delete,
-    rset_get_no_terms,
+    rset_get_one_term,
     r_open,
     r_close,
     rset_default_forward,
@@ -79,13 +80,20 @@ struct rset_temp_rfd {
     zint cur; /* number of the current hit */
 };
 
+static int log_level=0;
+static int log_level_initialized=0;
+
 RSET rstemp_create( NMEM nmem, const struct key_control *kcontrol,
                     int scope, 
-                    const char *temp_path)
+                    const char *temp_path, TERMID term)
 {
-    RSET rnew=rset_create_base(&control, nmem, kcontrol, scope,0);
+    RSET rnew=rset_create_base(&control, nmem, kcontrol, scope,term);
     struct rset_temp_info *info;
-   
+    if (!log_level_initialized)
+    {
+        log_level=yaz_log_module_level("rstemp");
+        log_level_initialized=1;
+    }
     info = (struct rset_temp_info *) nmem_malloc(rnew->nmem, sizeof(*info));
     info->fd = -1;
     info->fname = NULL;
@@ -99,7 +107,7 @@ RSET rstemp_create( NMEM nmem, const struct key_control *kcontrol,
     if (!temp_path)
         info->temp_path = NULL;
     else
-        info->temp_path = nmem_strdup(rnew->nmem,temp_path);
+        info->temp_path = nmem_strdup(rnew->nmem, temp_path);
     rnew->priv=info; 
     return rnew;
 } /* rstemp_create */
@@ -108,10 +116,10 @@ static void r_delete (RSET ct)
 {
     struct rset_temp_info *info = (struct rset_temp_info*) ct->priv;
 
-    logf (LOG_DEBUG, "r_delete: set size %ld", (long) info->pos_end);
+    yaz_log (log_level, "r_delete: set size %ld", (long) info->pos_end);
     if (info->fname)
     {
-        logf (LOG_DEBUG, "r_delete: unlink %s", info->fname);
+        yaz_log (log_level, "r_delete: unlink %s", info->fname);
         unlink (info->fname);
     }
 }
@@ -131,7 +139,7 @@ static RSFD r_open (RSET ct, int flag)
             info->fd = open (info->fname, O_BINARY|O_RDONLY);
         if (info->fd == -1)
         {
-            logf (LOG_FATAL|LOG_ERRNO, "open %s", info->fname);
+            yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: open failed %s", info->fname);
             exit (1);
         }
     }
@@ -146,7 +154,7 @@ static RSFD r_open (RSET ct, int flag)
     prfd->pos_cur = 0;
     info->pos_buf = 0;
     r_reread (rfd);
-    prfd->cur=0;
+    prfd->cur = 0;
     return rfd;
 }
 
@@ -162,31 +170,28 @@ static void r_flush (RSFD rfd, int mk)
     {
 #if HAVE_MKSTEMP
         char template[1024];
-
         if (info->temp_path)
-            sprintf (template, "%s/zrsXXXXXX", info->temp_path);
+            sprintf(template, "%s/zrsXXXXXX", info->temp_path);
         else
-            sprintf (template, "zrsXXXXXX");
+            sprintf(template, "zrsXXXXXX");
 
-        info->fd = mkstemp (template);
+        info->fd = mkstemp(template);
 
         if (info->fd == -1)
         {
-            logf (LOG_FATAL|LOG_ERRNO, "mkstemp %s", template);
+            yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: mkstemp %s", template);
             exit (1);
         }
-        info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1);
-        strcpy (info->fname, template);
+       info->fname = nmem_strdup(rfd->rset->nmem, template);
 #else
         char *s = (char*) tempnam (info->temp_path, "zrs");
-        info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1);
-        strcpy (info->fname, s);
+        info->fname= nmem_strdup(rfd->rset->nmem, s);
 
-        logf (LOG_DEBUG, "creating tempfile %s", info->fname);
-        info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666);
+        yaz_log(log_level, "creating tempfile %s", info->fname);
+        info->fd = open(info->fname, O_BINARY|O_RDWR|O_CREAT, 0666);
         if (info->fd == -1)
         {
-            logf (LOG_FATAL|LOG_ERRNO, "open %s", info->fname);
+            yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open %s", info->fname);
             exit (1);
         }
 #endif
@@ -198,7 +203,7 @@ static void r_flush (RSFD rfd, int mk)
         
         if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
         {
-            logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname);
+            yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek %s", info->fname);
             exit (1);
         }
         count = info->buf_size;
@@ -207,9 +212,9 @@ static void r_flush (RSFD rfd, int mk)
         if ((r = write (info->fd, info->buf_mem, count)) < (int) count)
         {
             if (r == -1)
-                logf (LOG_FATAL|LOG_ERRNO, "read %s", info->fname);
+                yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: write %s", info->fname);
             else
-                logf (LOG_FATAL, "write of %ld but got %ld",
+                yaz_log (YLOG_FATAL, "rstemp: write of %ld but got %ld",
                       (long) count, (long) r);
             exit (1);
         }
@@ -254,15 +259,15 @@ static void r_reread (RSFD rfd)
         {
             if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
             {
-                logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname);
+                yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek %s", info->fname);
                 exit (1);
             }
             if ((r = read (info->fd, info->buf_mem, count)) < (int) count)
             {
                 if (r == -1)
-                    logf (LOG_FATAL|LOG_ERRNO, "read %s", info->fname);
+                    yaz_log (YLOG_FATAL|YLOG_ERRNO, "rstemp: read %s", info->fname);
                 else
-                    logf (LOG_FATAL, "read of %ld but got %ld",
+                    yaz_log (YLOG_FATAL, "read of %ld but got %ld",
                           (long) count, (long) r);
                 exit (1);
             }