X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=297795c4fe3dfb0db02179297072ec76caeae184;hb=54ddb0c5a3a8157235271665cd874576e656eed4;hp=fc1f8720ece07656e844fc903e097239fd0385f7;hpb=3459774ec153f7f58f1860f2d24df8ff1df50b31;p=idzebra-moved-to-github.git diff --git a/index/trunc.c b/index/trunc.c index fc1f872..297795c 100644 --- 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.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); @@ -457,10 +458,18 @@ 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); return result; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +