X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=984249b1fdea6c695d31e324f96b518ca4538c25;hb=1c948d94056d5eb4e55ef3192a360514d7946669;hp=9448002df830feddf3a7757a6f9e05741a74529c;hpb=d50126fa619f94079daa731d66c305e86a38a85a;p=idzebra-moved-to-github.git

diff --git a/rset/rstemp.c b/rset/rstemp.c
index 9448002..984249b 100644
--- a/rset/rstemp.c
+++ b/rset/rstemp.c
@@ -1,4 +1,4 @@
-/* $Id: rstemp.c,v 1.50 2004-09-30 09:53:05 heikki Exp $
+/* $Id: rstemp.c,v 1.54 2004-11-04 13:54:08 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
    Index Data Aps
 
@@ -37,7 +37,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 static RSFD r_open (RSET ct, int flag);
 static void r_close (RSFD rfd);
 static void r_delete (RSET ct);
-static int r_read (RSFD rfd, void *buf);
+static int r_read (RSFD rfd, void *buf, TERMID *term);
 static int r_write (RSFD rfd, const void *buf);
 static void r_pos (RSFD rfd, double *current, double  *total);
 static void r_flush (RSFD rfd, int mk);
@@ -48,6 +48,7 @@ static const struct rset_control control =
 {
     "temp",
     r_delete,
+    rset_get_one_term,
     r_open,
     r_close,
     rset_default_forward,
@@ -78,13 +79,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);
+    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;
@@ -107,10 +115,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);
+    logf (log_level, "r_delete: set size %ld", (long) info->pos_end);
     if (info->fname)
     {
-        logf (LOG_DEBUG, "r_delete: unlink %s", info->fname);
+        logf (log_level, "r_delete: unlink %s", info->fname);
         unlink (info->fname);
     }
 }
@@ -130,7 +138,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);
+            logf (LOG_FATAL|LOG_ERRNO, "rstemp: open failed %s", info->fname);
             exit (1);
         }
     }
@@ -171,7 +179,7 @@ static void r_flush (RSFD rfd, int mk)
 
         if (info->fd == -1)
         {
-            logf (LOG_FATAL|LOG_ERRNO, "mkstemp %s", template);
+            logf (LOG_FATAL|LOG_ERRNO, "rstemp: mkstemp %s", template);
             exit (1);
         }
         info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1);
@@ -181,11 +189,11 @@ static void r_flush (RSFD rfd, int mk)
         info->fname= nmem_malloc(rfd->rset->nmem,strlen(template)+1);
         strcpy (info->fname, s);
 
-        logf (LOG_DEBUG, "creating tempfile %s", info->fname);
+        logf (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);
+            logf (LOG_FATAL|LOG_ERRNO, "rstemp: open %s", info->fname);
             exit (1);
         }
 #endif
@@ -197,7 +205,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);
+            logf (LOG_FATAL|LOG_ERRNO, "rstemp: lseek %s", info->fname);
             exit (1);
         }
         count = info->buf_size;
@@ -206,9 +214,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);
+                logf (LOG_FATAL|LOG_ERRNO, "rstemp: write %s", info->fname);
             else
-                logf (LOG_FATAL, "write of %ld but got %ld",
+                logf (LOG_FATAL, "rstemp: write of %ld but got %ld",
                       (long) count, (long) r);
             exit (1);
         }
@@ -253,13 +261,13 @@ 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);
+                logf (LOG_FATAL|LOG_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);
+                    logf (LOG_FATAL|LOG_ERRNO, "rstemp: read %s", info->fname);
                 else
                     logf (LOG_FATAL, "read of %ld but got %ld",
                           (long) count, (long) r);
@@ -272,7 +280,7 @@ static void r_reread (RSFD rfd)
 }
 
 
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
 {
     struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv;  
     struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv;
@@ -289,6 +297,9 @@ static int r_read (RSFD rfd, void *buf)
     }
     memcpy (buf, info->buf_mem + (mrfd->pos_cur - info->pos_buf),
             rfd->rset->keycontrol->key_size);
+    if (term)
+        *term=rfd->rset->term; 
+        /* FIXME - should we store and return terms ?? */
     mrfd->pos_cur = nc;
     mrfd->cur++;
     return 1;