-/* $Id: trunc.c,v 1.65 2006-05-10 08:13:22 adam Exp $
- Copyright (C) 1995-2005
+/* $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.
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
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)
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 ord_list *ol, int reg_type,
+ struct ord_list *ol, const char *index_type,
zint hits_limit, const char *term_ref_id)
{
TERMID termid;
int trunc_chunk;
termid = rset_term_create(term, length, flags, term_type, rset_nmem, ol,
- reg_type, hits_limit, term_ref_id);
+ *index_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", "20"));
result = rset_trunc_r(zi, term, length, flags, isam_p, 0, no, trunc_chunk,