-/* $Id: trunc.c,v 1.62 2005-07-21 13:05:16 adam Exp $
+/* $Id: trunc.c,v 1.66 2006-06-06 21:01:30 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
RSFD result_rsfd;
int nn = 0;
- result = rstemp_create(rset_nmem, kctrl, scope,
- res_get(zi->res, "setTmpDir"), termid);
+ result = rset_create_temp(rset_nmem, kctrl, scope,
+ res_get(zi->res, "setTmpDir"), termid);
result_rsfd = rset_open(result, RSETF_WRITE);
if (to - from > merge_chunk)
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_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);
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, termid);
+ return rset_create_null(rset_nmem, kctrl, termid);
if (zi->reg->isams)
{
rsets[i] = rsisamb_create(rset_nmem, kctrl, scope,
zi->reg->isamb, isam_p[i],
0 /* termid */);
- r = rsmulti_or_create(rset_nmem, kctrl, scope,
- termid /* termid */,
- no, rsets);
+ r = rset_create_or(rset_nmem, kctrl, scope,
+ termid, no, rsets);
xfree(rsets);
return r;
}
else
{
yaz_log(YLOG_WARN, "Unknown isam set in rset_trunc");
- return rsnull_create(rset_nmem, kctrl, 0);
+ return rset_create_null(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
+ */
+