X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Ftrunc.c;h=eb81fbbed48be025cf122f65300675abb510f497;hp=c664daae7c8461bbad914994294eab022ad1f3b7;hb=354f1142c4cc8c59b6f1170b95caec40bfe4d8c0;hpb=2eacaa1e549428b231de5844f397466f6a44c59f diff --git a/index/trunc.c b/index/trunc.c index c664daa..eb81fbb 100644 --- a/index/trunc.c +++ b/index/trunc.c @@ -1,8 +1,5 @@ -/* $Id: trunc.c,v 1.69 2007-10-29 16:57:53 adam Exp $ - Copyright (C) 1995-2007 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 1994-2011 Index Data Zebra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -21,6 +18,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include @@ -149,27 +149,27 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length, 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); - + for (i = from; i < to; i += i_add) { if (i_add <= to - i) rset[rscur] = rset_trunc_r(zi, term, length, flags, isam_p, i, i+i_add, merge_chunk, preserve_position, - term_type, rset_nmem_sub, + 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_sub, + term_type, rset_nmem_sub, kctrl, scope, 0); rscur++; } - ti = heap_init (rscur, sizeof(struct it_key), key_compare_it); + ti = heap_init (rscur, sizeof(struct it_key), key_compare); for (i = rscur; --i >= 0; ) { rsfd[i] = rset_open(rset[i], RSETF_READ); @@ -219,7 +219,7 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length, ispt = (ISAMC_PP *) xmalloc(sizeof(*ispt) * (to-from)); ti = heap_init(to-from, sizeof(struct it_key), - key_compare_it); + key_compare); for (i = to-from; --i >= 0; ) { ispt[i] = isamc_pp_open(zi->reg->isamc, isam_p[from+i]); @@ -274,7 +274,7 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length, ispt = (ISAMS_PP *) xmalloc(sizeof(*ispt) * (to-from)); ti = heap_init(to-from, sizeof(struct it_key), - key_compare_it); + key_compare); for (i = to-from; --i >= 0; ) { ispt[i] = isams_pp_open(zi->reg->isams, isam_p[from+i]); @@ -317,7 +317,7 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length, ispt = (ISAMB_PP *) xmalloc(sizeof(*ispt) * (to-from)); ti = heap_init(to-from, sizeof(struct it_key), - key_compare_it); + key_compare); for (i = to-from; --i >= 0; ) { if (isam_p[from+i]) { @@ -400,7 +400,7 @@ static int isamc_trunc_cmp(const void *p1, const void *p2) return 0; } -RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no, +RSET rset_trunc(ZebraHandle zh, 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, @@ -410,55 +410,36 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no, TERMID termid; RSET result; int trunc_chunk; - + int trunc_limit = atoi(res_get_def(zh->res, "trunclimit", "10000")); + termid = rset_term_create(term, length, flags, term_type, rset_nmem, ol, *index_type, hits_limit, term_ref_id); + if (no < 1) return rset_create_null(rset_nmem, kctrl, termid); - - if (zi->reg->isams) - { - if (no == 1) - return rsisams_create(rset_nmem, kctrl, scope, - zi->reg->isams, *isam_p, termid); - qsort(isam_p, no, sizeof(*isam_p), isams_trunc_cmp); - } - else if (zi->reg->isamc) + else if (no == 1) + return zebra_create_rset_isam(zh, rset_nmem, kctrl, + scope, *isam_p, termid); + else if (zh->reg->isamb && no > 1 && no < trunc_limit) { - if (no == 1) - return rsisamc_create(rset_nmem, kctrl, scope, - zi->reg->isamc, *isam_p, termid); - qsort(isam_p, no, sizeof(*isam_p), isamc_trunc_cmp); + RSET r; + RSET *rsets = xmalloc(no*sizeof(RSET)); /* use nmem! */ + int i; + for (i = 0; ireg->isamb, isam_p[i], + 0 /* termid */); + r = rset_create_or(rset_nmem, kctrl, scope, + termid, no, rsets); + xfree(rsets); + return r; } - else if (zi->reg->isamb) - { - int trunc_limit = atoi(res_get_def(zi->res, "trunclimit", "10000")); - if (no == 1) - return rsisamb_create(rset_nmem, kctrl, scope, - zi->reg->isamb, *isam_p, termid); - else if (no < trunc_limit) - { - RSET r; - RSET *rsets = xmalloc(no*sizeof(RSET)); /* use nmem! */ - int i; - for (i = 0; ireg->isamb, isam_p[i], - 0 /* termid */); - r = rset_create_or(rset_nmem, kctrl, scope, - termid, no, rsets); - xfree(rsets); - return r; - } + if (zh->reg->isamc) qsort(isam_p, no, sizeof(*isam_p), isamc_trunc_cmp); - } else - { - yaz_log(YLOG_WARN, "Unknown isam set in rset_trunc"); - return rset_create_null(rset_nmem, kctrl, 0); - } - trunc_chunk = atoi(res_get_def(zi->res, "truncchunk", "20")); - result = rset_trunc_r(zi, term, length, flags, isam_p, 0, no, trunc_chunk, + qsort(isam_p, no, sizeof(*isam_p), isams_trunc_cmp); + trunc_chunk = atoi(res_get_def(zh->res, "truncchunk", "20")); + result = rset_trunc_r(zh, term, length, flags, isam_p, 0, no, trunc_chunk, preserve_position, term_type, rset_nmem, kctrl, scope, termid); return result; @@ -467,6 +448,7 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no, /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab