X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=893e1c03048290be397751b9ae9856bfd6ad455d;hb=1dfb2eabceebab1841f13a07314171c00873409d;hp=391a64e07f8e2ef419779d2dd3096d807b8f8152;hpb=13bf0c380e98816595127291b64368dd9b8ca639;p=idzebra-moved-to-github.git

diff --git a/index/trunc.c b/index/trunc.c
index 391a64e..893e1c0 100644
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,4 +1,4 @@
-/* $Id: trunc.c,v 1.43 2004-09-03 14:59:49 heikki Exp $
+/* $Id: trunc.c,v 1.47 2004-10-20 14:32:28 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -127,7 +127,7 @@ 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)
+                          const struct key_control *kctrl, int scope)
 {
     RSET result; 
     RSFD result_rsfd;
@@ -140,7 +140,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
     parms.temp_path = res_get (zi->res, "setTmpDir");
     result = rset_create (rset_kind_temp, &parms);
     */
-    result=rstemp_create( rset_nmem,kctrl,
+    result=rstemp_create( rset_nmem,kctrl, scope,
             res_get (zi->res, "setTmpDir"));
     result_rsfd = rset_open (result, RSETF_WRITE);
 
@@ -162,19 +162,21 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
                 rset[rscur] = rset_trunc_r (zi, term, length, flags,
 				            isam_p, i, i+i_add,
                                             merge_chunk, preserve_position,
-                                            term_type, rset_nmem, kctrl);
+                                            term_type, rset_nmem, 
+                                            kctrl, scope);
             else
                 rset[rscur] = rset_trunc_r (zi, term, length, flags,
                                             isam_p, i, to,
                                             merge_chunk, preserve_position,
-                                            term_type, rset_nmem, kctrl);
+                                            term_type, rset_nmem, 
+                                            kctrl, scope);
             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
             {
@@ -191,7 +193,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]);
@@ -321,7 +323,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         for (i = to-from; --i >= 0; )
         {
 	    if (isam_p[from+i]) {
-                ispt[i] = isamb_pp_open (zi->reg->isamb, isam_p[from+i]);
+                ispt[i] = isamb_pp_open (zi->reg->isamb, isam_p[from+i], scope);
                 if (isamb_pp_read (ispt[i], ti->tmpbuf))
                     heap_insert (ti, ti->tmpbuf, i);
                 else
@@ -403,40 +405,43 @@ static int isamc_trunc_cmp (const void *p1, const void *p2)
 RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
 		 const char *term, int length, const char *flags,
                  int preserve_position, int term_type, NMEM rset_nmem,
-                 const struct key_control *kctrl)
+                 const struct key_control *kctrl, int scope)
 {
+    TERMID termid;
     logf (LOG_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,
-                    zi->reg->isams, *isam_p);
+            return rsisams_create(rset_nmem, kctrl, scope,
+                    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,
-                    zi->reg->isamc, *isam_p);
+            return rsisamc_create(rset_nmem, kctrl, scope,
+                    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,
-                    zi->reg->isamb, *isam_p);
+            return rsisamb_create(rset_nmem,kctrl, scope,
+                    zi->reg->isamb, *isam_p, termid);
         else if (no <10000 ) /* FIXME - hardcoded number */
         {
             RSET r;
             RSET *rsets=xmalloc(no*sizeof(RSET)); /* use nmem! */
             int i;
             for (i=0;i<no;i++)
-                rsets[i]=rsisamb_create(rset_nmem, kctrl,
-                    zi->reg->isamb, isam_p[i] );
-            r=rsmultior_create( rset_nmem, kctrl, no, rsets);
+                rsets[i]=rsisamb_create(rset_nmem, kctrl, scope,
+                    zi->reg->isamb, isam_p[i], termid);
+            r=rsmultior_create( rset_nmem, kctrl, scope, no, rsets);
             xfree(rsets);
+            return r;
         } 
         qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
     }
@@ -446,6 +451,6 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
 	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);
+                         preserve_position, term_type, rset_nmem,kctrl,scope);
 }