Extended the result set system. Added support for filtering/limits.

[idzebra-moved-to-github.git] / index / trunc.c

diff --git a/index/trunc.c b/index/trunc.c
index 683460c..891f9a7 100644 (file)
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,4 +1,4 @@
-/* $Id: trunc.c,v 1.53 2005-04-20 08:32:36 adam Exp $
+/* $Id: trunc.c,v 1.57 2005-05-03 09:11:34 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -127,15 +127,15 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
                          const char *flags, ISAM_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,
+                        struct rset_key_control *kctrl, int scope,
                         TERMID termid)
 {
-    RSET result; 
+    RSET result;
     RSFD result_rsfd;
     int nn = 0;
 
-    result = rstemp_create( rset_nmem,kctrl, scope,
-                           res_get(zi->res, "setTmpDir"), termid);
+    result = rstemp_create(rset_nmem, kctrl, scope,
+                          res_get(zi->res, "setTmpDir"), termid);
     result_rsfd = rset_open(result, RSETF_WRITE);
 
     if (to - from > merge_chunk)
@@ -157,20 +157,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,termid);
+                                          kctrl, scope, 0);
             else
                 rset[rscur] = rset_trunc_r(zi, term, length, flags,
                                           isam_p, i, to,
                                           merge_chunk, preserve_position,
                                           term_type, rset_nmem, 
-                                          kctrl, scope,termid);
+                                          kctrl, scope, 0);
             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,0))
+            if (rset_read(rsfd[i], ti->tmpbuf, 0))
                 heap_insert(ti, ti->tmpbuf, i);
             else
             {
@@ -399,14 +399,16 @@ static int isamc_trunc_cmp(const void *p1, const void *p2)
 RSET rset_trunc(ZebraHandle zi, ISAM_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, int scope)
+               struct rset_key_control *kctrl, int scope)
 {
     TERMID termid;
+    RSET result;
     int trunc_chunk;
-    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);
+       return rsnull_create(rset_nmem, kctrl);
+    
+    termid = rset_term_create(term, length, flags, term_type, rset_nmem);
     if (zi->reg->isams)
     {
         if (no == 1)
@@ -425,7 +427,7 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no,
     {
        int trunc_limit = atoi(res_get_def(zi->res, "trunclimit", "10000"));
         if (no == 1)
-            return rsisamb_create(rset_nmem,kctrl, scope,
+            return rsisamb_create(rset_nmem, kctrl, scope,
                                  zi->reg->isamb, *isam_p, termid);
         else if (no < trunc_limit) 
         {
@@ -439,7 +441,6 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no,
             xfree(rsets);
             return r;
         } 
-       fprintf(stderr, "Using rset_trunc_r limit=%d\n", trunc_limit);
         qsort(isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
     }
     else
@@ -448,8 +449,9 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no,
        return rsnull_create(rset_nmem, kctrl);
     }
     trunc_chunk = atoi(res_get_def(zi->res, "truncchunk", "100"));
-    return rset_trunc_r(zi, term, length, flags, isam_p, 0, no, trunc_chunk,
-                       preserve_position, term_type, rset_nmem, kctrl, scope,
-                       termid);
+    result = rset_trunc_r(zi, term, length, flags, isam_p, 0, no, trunc_chunk,
+                         preserve_position, term_type, rset_nmem, kctrl,
+                         scope, termid);
+    return result;
 }