X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=cc7fd51dee087736a5ac9e1e71bbd576e136d99c;hb=60ef5f615dd758097e842067a875307df11e4f07;hp=5782aebbd64b760b53f7e155fb8e1feae0f3ef9b;hpb=df1bf5bea1452112a786e8f7b85607b46c856315;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index 5782aeb..cc7fd51 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $Id: zebraapi.c,v 1.191 2005-10-21 18:29:04 adam Exp $ +/* $Id: zebraapi.c,v 1.193 2005-10-28 09:22:50 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -326,14 +326,13 @@ struct zebra_register *zebra_register_open(ZebraService zs, const char *name, reg->key_buf = 0; - reg->keys.buf_max = 0; - reg->keys.buf = 0; - reg->keys.codec_handle = iscz1_start(); + reg->keys = zebra_rec_keys_open(); +#if NATTR + reg->sortKeys = zebra_rec_keys_open(); +#else reg->sortKeys.buf = 0; reg->sortKeys.buf_max = 0; -#if NATTR - reg->sortKeys.codec_handle = iscz1_start(); #endif reg->records = 0; @@ -496,14 +495,13 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg) bfs_destroy (reg->bfs); data1_destroy (reg->dh); - xfree(reg->sortKeys.buf); - xfree(reg->keys.buf); - if (reg->keys.codec_handle) - iscz1_stop(reg->keys.codec_handle); + zebra_rec_keys_close(reg->keys); #if NATTR - if (reg->sortKeys.codec_handle) - iscz1_stop(reg->sortKeys.codec_handle); + zebra_rec_keys_close(rec->sortKeys); +#else + xfree(reg->sortKeys.buf); #endif + xfree(reg->key_buf); xfree(reg->name); xfree(reg);