From: Adam Dickmeiss <adam@indexdata.dk>
Date: Sat, 22 Oct 2005 17:27:28 +0000 (+0000)
Subject: Attempt to fix #415: Strange truncation behavior
X-Git-Tag: ZEBRA.1.3.30~2
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=a7b1981180250dabd0520550716b5620c84336b7;p=idzebra-moved-to-github.git

Attempt to fix #415: Strange truncation behavior
---

diff --git a/index/trunc.c b/index/trunc.c
index ff17e47..7eaeb67 100644
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,4 +1,4 @@
-/* $Id: trunc.c,v 1.28.2.3 2005-01-23 15:06:21 adam Exp $
+/* $Id: trunc.c,v 1.28.2.4 2005-10-22 17:27:28 adam Exp $
    Copyright (C) 1995-2005
    Index Data Aps
 
@@ -160,6 +160,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;
         
         rset = (RSET *) xmalloc (sizeof(*rset) * rsmax);
         rsfd = (RSFD *) xmalloc (sizeof(*rsfd) * rsmax);
@@ -206,7 +207,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);