X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=59ad37813109ed0363e2921b0c2f7b323c6c6fb7;hb=a34c87ac6c08ec62534e4068a5bd1fac93df8abe;hp=a683a0c839a5fbe2c10b81fc13f6aacbdee9bb18;hpb=c04a10ad2c24474c9c86a8a1453f6f40e4bc1853;p=idzebra-moved-to-github.git

diff --git a/index/trunc.c b/index/trunc.c
index a683a0c..59ad378 100644
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,4 +1,4 @@
-/* $Id: trunc.c,v 1.45 2004-09-29 11:00:56 heikki Exp $
+/* $Id: trunc.c,v 1.49 2004-11-19 10:27:03 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -127,7 +127,8 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
                           const char *flags, ISAMS_P *isam_p, int from, int to,
                           int merge_chunk, int preserve_position,
                           int term_type, NMEM rset_nmem,
-                          const struct key_control *kctrl, int scope)
+                          const struct key_control *kctrl, int scope,
+                          TERMID termid)
 {
     RSET result; 
     RSFD result_rsfd;
@@ -141,7 +142,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
     result = rset_create (rset_kind_temp, &parms);
     */
     result=rstemp_create( rset_nmem,kctrl, scope,
-            res_get (zi->res, "setTmpDir"));
+            res_get (zi->res, "setTmpDir"), termid);
     result_rsfd = rset_open (result, RSETF_WRITE);
 
     if (to - from > merge_chunk)
@@ -163,20 +164,20 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
 				            isam_p, i, i+i_add,
                                             merge_chunk, preserve_position,
                                             term_type, rset_nmem, 
-                                            kctrl, scope);
+                                            kctrl, scope,termid);
             else
                 rset[rscur] = rset_trunc_r (zi, term, length, flags,
                                             isam_p, i, to,
                                             merge_chunk, preserve_position,
                                             term_type, rset_nmem, 
-                                            kctrl, scope);
+                                            kctrl, scope,termid);
             rscur++;
         }
         ti = heap_init (rscur, sizeof(struct it_key), key_compare_it);
         for (i = rscur; --i >= 0; )
         {
             rsfd[i] = rset_open (rset[i], RSETF_READ);
-            if (rset_read(rsfd[i], ti->tmpbuf))
+            if (rset_read(rsfd[i], ti->tmpbuf,0))
                 heap_insert (ti, ti->tmpbuf, i);
             else
             {
@@ -193,7 +194,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
 
             while (1)
             {
-                if (!rset_read (rsfd[n], ti->tmpbuf))
+                if (!rset_read (rsfd[n], ti->tmpbuf,0))
                 {
                     heap_delete (ti);
                     rset_close (rsfd[n]);
@@ -368,7 +369,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         xfree (ispt);
     }
     else
-        logf (LOG_WARN, "Unknown isam set in rset_trunc_r");
+        yaz_log (YLOG_WARN, "Unknown isam set in rset_trunc_r");
 
     rset_close (result_rsfd);
     return result;
@@ -407,28 +408,30 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
                  int preserve_position, int term_type, NMEM rset_nmem,
                  const struct key_control *kctrl, int scope)
 {
-    logf (LOG_DEBUG, "rset_trunc no=%d", no);
+    TERMID termid;
+    yaz_log (YLOG_DEBUG, "rset_trunc no=%d", no);
     if (no < 1)
 	return rsnull_create (rset_nmem,kctrl);
+    termid=rset_term_create(term, length, flags, term_type,rset_nmem);
     if (zi->reg->isams)
     {
         if (no == 1)
             return rsisams_create(rset_nmem, kctrl, scope,
-                    zi->reg->isams, *isam_p); 
+                    zi->reg->isams, *isam_p, termid);
         qsort (isam_p, no, sizeof(*isam_p), isams_trunc_cmp);
     }
     else if (zi->reg->isamc)
     {
         if (no == 1)
             return rsisamc_create(rset_nmem, kctrl, scope,
-                    zi->reg->isamc, *isam_p);
+                    zi->reg->isamc, *isam_p, termid);
         qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
     }
     else if (zi->reg->isamb)
     {
         if (no == 1)
             return rsisamb_create(rset_nmem,kctrl, scope,
-                    zi->reg->isamb, *isam_p);
+                    zi->reg->isamb, *isam_p, termid);
         else if (no <10000 ) /* FIXME - hardcoded number */
         {
             RSET r;
@@ -436,7 +439,7 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
             int i;
             for (i=0;i<no;i++)
                 rsets[i]=rsisamb_create(rset_nmem, kctrl, scope,
-                    zi->reg->isamb, isam_p[i] );
+                    zi->reg->isamb, isam_p[i], termid);
             r=rsmultior_create( rset_nmem, kctrl, scope, no, rsets);
             xfree(rsets);
             return r;
@@ -445,10 +448,11 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
     }
     else
     {
-        logf (LOG_WARN, "Unknown isam set in rset_trunc");
+        yaz_log (YLOG_WARN, "Unknown isam set in rset_trunc");
 	return rsnull_create (rset_nmem, kctrl);
     }
     return rset_trunc_r (zi, term, length, flags, isam_p, 0, no, 100,
-                         preserve_position, term_type, rset_nmem,kctrl,scope);
+                         preserve_position, term_type, rset_nmem,kctrl,scope,
+                         termid);
 }