X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=297795c4fe3dfb0db02179297072ec76caeae184;hb=05f31b27a8b7d81cfd3e9767ad2c2b58771bc142;hp=1c70d4f7cd10c6ff37d7008759116802b4564428;hpb=3caf18527ce7a4c423453bb755aed257e5300bd1;p=idzebra-moved-to-github.git diff --git a/index/trunc.c b/index/trunc.c index 1c70d4f..297795c 100644 --- a/index/trunc.c +++ b/index/trunc.c @@ -1,4 +1,4 @@ -/* $Id: trunc.c,v 1.63 2005-08-25 10:37:05 adam Exp $ +/* $Id: trunc.c,v 1.65 2006-05-10 08:13:22 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); @@ -464,3 +465,11 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no, return result; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +