-/* $Id: trunc.c,v 1.57 2005-05-03 09:11:34 adam Exp $
+/* $Id: trunc.c,v 1.64 2005-10-22 17:32:09 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
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 */
rset = (RSET *) xmalloc(sizeof(*rset) * rsmax);
rsfd = (RSFD *) xmalloc(sizeof(*rsfd) * rsmax);
rset[rscur] = rset_trunc_r(zi, term, length, flags,
isam_p, i, i+i_add,
merge_chunk, preserve_position,
- term_type, rset_nmem,
+ term_type, rset_nmem_sub,
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,
+ term_type, rset_nmem_sub,
kctrl, scope, 0);
rscur++;
}
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);
xfree(rset);
xfree(rsfd);
heap_close(ti);
+ nmem_destroy(rset_nmem_sub);
}
else if (zi->reg->isamc)
{
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,
- struct rset_key_control *kctrl, int scope)
+ struct rset_key_control *kctrl, int scope,
+ struct ord_list *ol, int reg_type,
+ zint hits_limit, const char *term_ref_id)
{
TERMID termid;
RSET result;
int trunc_chunk;
+ termid = rset_term_create(term, length, flags, term_type, rset_nmem, ol,
+ reg_type, hits_limit, term_ref_id);
if (no < 1)
- return rsnull_create(rset_nmem, kctrl);
+ return rsnull_create(rset_nmem, kctrl, termid);
- termid = rset_term_create(term, length, flags, term_type, rset_nmem);
if (zi->reg->isams)
{
if (no == 1)
int i;
for (i = 0; i<no; i++)
rsets[i] = rsisamb_create(rset_nmem, kctrl, scope,
- zi->reg->isamb, isam_p[i], termid);
- r = rsmulti_or_create( rset_nmem, kctrl, scope, no, rsets);
+ zi->reg->isamb, isam_p[i],
+ 0 /* termid */);
+ r = rsmulti_or_create(rset_nmem, kctrl, scope,
+ termid /* termid */,
+ no, rsets);
xfree(rsets);
return r;
}
else
{
yaz_log(YLOG_WARN, "Unknown isam set in rset_trunc");
- return rsnull_create(rset_nmem, kctrl);
+ 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);