-/* $Id: trunc.c,v 1.46 2004-10-15 10:07:32 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: trunc.c,v 1.51 2005-01-15 20:47:15 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
int (*cmp)(const void *p1,
const void *p2))
{
- struct trunc_info *ti = (struct trunc_info *) xmalloc (sizeof(*ti));
+ struct trunc_info *ti = (struct trunc_info *) xmalloc(sizeof(*ti));
int i;
++size;
ti->heapnum = 0;
ti->keysize = key_size;
ti->cmp = cmp;
- ti->indx = (int *) xmalloc (size * sizeof(*ti->indx));
- ti->heap = (char **) xmalloc (size * sizeof(*ti->heap));
- ti->ptr = (int *) xmalloc (size * sizeof(*ti->ptr));
- ti->swapbuf = (char *) xmalloc (ti->keysize);
- ti->tmpbuf = (char *) xmalloc (ti->keysize);
- ti->buf = (char *) xmalloc (size * ti->keysize);
+ ti->indx = (int *) xmalloc(size * sizeof(*ti->indx));
+ ti->heap = (char **) xmalloc(size * sizeof(*ti->heap));
+ ti->ptr = (int *) xmalloc(size * sizeof(*ti->ptr));
+ ti->swapbuf = (char *) xmalloc(ti->keysize);
+ ti->tmpbuf = (char *) xmalloc(ti->keysize);
+ ti->buf = (char *) xmalloc(size * ti->keysize);
for (i = size; --i >= 0; )
{
ti->ptr[i] = i;
static void heap_close (struct trunc_info *ti)
{
- xfree (ti->ptr);
- xfree (ti->indx);
- xfree (ti->heap);
- xfree (ti->swapbuf);
- xfree (ti->tmpbuf);
- xfree (ti->buf);
- xfree (ti);
+ xfree(ti->ptr);
+ xfree(ti->indx);
+ xfree(ti->heap);
+ xfree(ti->swapbuf);
+ xfree(ti->tmpbuf);
+ xfree(ti->buf);
+ xfree(ti);
}
static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
const char *flags, ISAMS_P *isam_p, int from, int to,
int merge_chunk, int preserve_position,
int term_type, NMEM rset_nmem,
- const struct key_control *kctrl, int scope)
+ const struct key_control *kctrl, int scope,
+ TERMID termid)
{
RSET result;
RSFD result_rsfd;
parms.temp_path = res_get (zi->res, "setTmpDir");
result = rset_create (rset_kind_temp, &parms);
*/
- result=rstemp_create( rset_nmem,kctrl, scope,
- res_get (zi->res, "setTmpDir"));
+ result = rstemp_create( rset_nmem,kctrl, scope,
+ res_get (zi->res, "setTmpDir"), termid);
result_rsfd = rset_open (result, RSETF_WRITE);
if (to - from > merge_chunk)
int rscur = 0;
int rsmax = (to-from)/i_add + 1;
- rset = (RSET *) xmalloc (sizeof(*rset) * rsmax);
- rsfd = (RSFD *) xmalloc (sizeof(*rsfd) * rsmax);
+ rset = (RSET *) xmalloc(sizeof(*rset) * rsmax);
+ rsfd = (RSFD *) xmalloc(sizeof(*rsfd) * rsmax);
for (i = from; i < to; i += i_add)
{
isam_p, i, i+i_add,
merge_chunk, preserve_position,
term_type, rset_nmem,
- kctrl, scope);
+ kctrl, scope,termid);
else
rset[rscur] = rset_trunc_r (zi, term, length, flags,
isam_p, i, to,
merge_chunk, preserve_position,
term_type, rset_nmem,
- kctrl, scope);
+ kctrl, scope,termid);
rscur++;
}
ti = heap_init (rscur, sizeof(struct it_key), key_compare_it);
}
}
}
- xfree (rset);
- xfree (rsfd);
+ xfree(rset);
+ xfree(rsfd);
heap_close (ti);
}
else if (zi->reg->isamc)
int i;
struct trunc_info *ti;
- ispt = (ISAMC_PP *) xmalloc (sizeof(*ispt) * (to-from));
+ ispt = (ISAMC_PP *) xmalloc(sizeof(*ispt) * (to-from));
ti = heap_init (to-from, sizeof(struct it_key),
key_compare_it);
}
}
heap_close (ti);
- xfree (ispt);
+ xfree(ispt);
}
else if (zi->reg->isams)
{
struct trunc_info *ti;
int nn = 0;
- ispt = (ISAMS_PP *) xmalloc (sizeof(*ispt) * (to-from));
+ ispt = (ISAMS_PP *) xmalloc(sizeof(*ispt) * (to-from));
ti = heap_init (to-from, sizeof(struct it_key),
key_compare_it);
}
}
heap_close (ti);
- xfree (ispt);
+ xfree(ispt);
}
else if (zi->reg->isamb)
{
int i;
struct trunc_info *ti;
- ispt = (ISAMB_PP *) xmalloc (sizeof(*ispt) * (to-from));
+ ispt = (ISAMB_PP *) xmalloc(sizeof(*ispt) * (to-from));
ti = heap_init (to-from, sizeof(struct it_key),
key_compare_it);
}
}
heap_close (ti);
- xfree (ispt);
+ xfree(ispt);
}
else
- logf (LOG_WARN, "Unknown isam set in rset_trunc_r");
+ yaz_log (YLOG_WARN, "Unknown isam set in rset_trunc_r");
rset_close (result_rsfd);
return result;
int preserve_position, int term_type, NMEM rset_nmem,
const struct key_control *kctrl, int scope)
{
- logf (LOG_DEBUG, "rset_trunc no=%d", no);
+ TERMID termid;
+ yaz_log (YLOG_DEBUG, "rset_trunc no=%d", no);
if (no < 1)
return rsnull_create (rset_nmem,kctrl);
+ termid = rset_term_create(term, length, flags, term_type,rset_nmem);
if (zi->reg->isams)
{
if (no == 1)
return rsisams_create(rset_nmem, kctrl, scope,
- zi->reg->isams, *isam_p,
- 0 /*FIXME - use proper TERMID*/);
+ zi->reg->isams, *isam_p, termid);
qsort (isam_p, no, sizeof(*isam_p), isams_trunc_cmp);
}
else if (zi->reg->isamc)
{
if (no == 1)
return rsisamc_create(rset_nmem, kctrl, scope,
- zi->reg->isamc, *isam_p,
- 0 /*FIXME - use proper TERMID*/);
+ zi->reg->isamc, *isam_p, termid);
qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
}
else if (zi->reg->isamb)
{
if (no == 1)
return rsisamb_create(rset_nmem,kctrl, scope,
- zi->reg->isamb, *isam_p, 0 /* FIXME - TERMID */ );
+ zi->reg->isamb, *isam_p, termid);
else if (no <10000 ) /* FIXME - hardcoded number */
{
RSET r;
- RSET *rsets=xmalloc(no*sizeof(RSET)); /* use nmem! */
+ RSET *rsets = xmalloc(no*sizeof(RSET)); /* use nmem! */
int i;
- for (i=0;i<no;i++)
+ for (i = 0; i<no; i++)
rsets[i]=rsisamb_create(rset_nmem, kctrl, scope,
- zi->reg->isamb, isam_p[i],
- 0 /* FIXME - use a proper TERMID */ );
- r=rsmultior_create( rset_nmem, kctrl, scope, no, rsets);
+ zi->reg->isamb, isam_p[i], termid);
+ r = rsmulti_or_create( rset_nmem, kctrl, scope, no, rsets);
xfree(rsets);
return r;
}
}
else
{
- logf (LOG_WARN, "Unknown isam set in rset_trunc");
+ yaz_log (YLOG_WARN, "Unknown isam set in rset_trunc");
return rsnull_create (rset_nmem, kctrl);
}
return rset_trunc_r (zi, term, length, flags, isam_p, 0, no, 100,
- preserve_position, term_type, rset_nmem,kctrl,scope);
+ preserve_position, term_type, rset_nmem,kctrl,scope,
+ termid);
}