Added check for sys/wait.h

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

diff --git a/index/trunc.c b/index/trunc.c
index fc1f872..00f453c 100644 (file)
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,4 +1,4 @@
-/* $Id: trunc.c,v 1.62 2005-07-21 13:05:16 adam Exp $
+/* $Id: trunc.c,v 1.64 2005-10-22 17:32:09 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -146,6 +146,7 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
         struct trunc_info *ti;
         int rscur = 0;
         int rsmax = (to-from)/i_add + 1;
+       int cmp_border = preserve_position ? 0 : 1;
        NMEM rset_nmem_sub = nmem_create(); /* all sub rsets not needed
                                               after this */
         
@@ -196,7 +197,7 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
                     rset_delete(rset[n]);
                     break;
                 }
-                if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1)
+                if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > cmp_border)
                 {
                     heap_delete(ti);
                     heap_insert(ti, ti->tmpbuf, n);
@@ -457,7 +458,7 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no,
         yaz_log(YLOG_WARN, "Unknown isam set in rset_trunc");
        return rsnull_create(rset_nmem, kctrl, 0);
     }
-    trunc_chunk = atoi(res_get_def(zi->res, "truncchunk", "100"));
+    trunc_chunk = atoi(res_get_def(zi->res, "truncchunk", "20"));
     result = rset_trunc_r(zi, term, length, flags, isam_p, 0, no, trunc_chunk,
                          preserve_position, term_type, rset_nmem, kctrl,
                          scope, termid);