projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Swap functions - minor changes to compare tst function
[idzebra-moved-to-github.git]
/
index
/
trunc.c
diff --git
a/index/trunc.c
b/index/trunc.c
index
0ebf73a
..
59ad378
100644
(file)
--- a/
index/trunc.c
+++ b/
index/trunc.c
@@
-1,4
+1,4
@@
-/* $Id: trunc.c,v 1.46 2004-10-15 10:07:32 heikki Exp $
+/* $Id: trunc.c,v 1.49 2004-11-19 10:27:03 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-127,7
+127,8
@@
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 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;
{
RSET result;
RSFD result_rsfd;
@@
-141,7
+142,7
@@
static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
result = rset_create (rset_kind_temp, &parms);
*/
result=rstemp_create( rset_nmem,kctrl, scope,
result = rset_create (rset_kind_temp, &parms);
*/
result=rstemp_create( rset_nmem,kctrl, scope,
- res_get (zi->res, "setTmpDir"));
+ res_get (zi->res, "setTmpDir"), termid);
result_rsfd = rset_open (result, RSETF_WRITE);
if (to - from > merge_chunk)
result_rsfd = rset_open (result, RSETF_WRITE);
if (to - from > merge_chunk)
@@
-163,13
+164,13
@@
static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
isam_p, i, i+i_add,
merge_chunk, preserve_position,
term_type, rset_nmem,
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,
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);
rscur++;
}
ti = heap_init (rscur, sizeof(struct it_key), key_compare_it);
@@
-368,7
+369,7
@@
static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
xfree (ispt);
}
else
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;
rset_close (result_rsfd);
return result;
@@
-407,30
+408,30
@@
RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
int preserve_position, int term_type, NMEM rset_nmem,
const struct key_control *kctrl, int scope)
{
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);
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,
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,
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,
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;
else if (no <10000 ) /* FIXME - hardcoded number */
{
RSET r;
@@
-438,8
+439,7
@@
RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
int i;
for (i=0;i<no;i++)
rsets[i]=rsisamb_create(rset_nmem, kctrl, scope,
int 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 */ );
+ zi->reg->isamb, isam_p[i], termid);
r=rsmultior_create( rset_nmem, kctrl, scope, no, rsets);
xfree(rsets);
return r;
r=rsmultior_create( rset_nmem, kctrl, scope, no, rsets);
xfree(rsets);
return r;
@@
-448,10
+448,11
@@
RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
}
else
{
}
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,
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);
}
}