From d8deeadf0ff6606e63ce21b2b2499a40d69e482c Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 15 Nov 2007 08:53:24 +0000 Subject: [PATCH] Version 2.0.19. Use YAZ' wrbuf_write_escaped. --- configure.ac | 6 +++--- debian/changelog | 6 ++++++ include/idzebra/version.h | 6 +++--- index/rpnsearch.c | 4 ++-- util/zebramap.c | 8 ++++---- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 79ecc5b..60c82b0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl Zebra, Index Data ApS, 1995-2007 -dnl $Id: configure.ac,v 1.67 2007-11-12 13:41:19 adam Exp $ +dnl $Id: configure.ac,v 1.68 2007-11-15 08:53:24 adam Exp $ dnl AC_PREREQ(2.59) -AC_INIT([idzebra],[2.0.18],[zebra-help@indexdata.dk]) +AC_INIT([idzebra],[2.0.19],[zebra-help@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([1.8]) @@ -34,7 +34,7 @@ if test "$ac_cv_lib_crypt_crypt" = "yes"; then fi dnl dnl ------ YAZ -YAZ_INIT([server icu],[3.0.16]) +YAZ_INIT([server icu],[3.0.17]) if test "$YAZVERSION" = "NONE"; then AC_MSG_ERROR([YAZ development libraries required]) fi diff --git a/debian/changelog b/debian/changelog index 42e258d..c6d8c62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +idzebra (2.0.19-1) unstable; urgency=low + + * Internal. + + -- Adam Dickmeiss Thu, 15 Nov 2007 09:51:48 +0100 + idzebra (2.0.18-1) unstable; urgency=low * Upstream. diff --git a/include/idzebra/version.h b/include/idzebra/version.h index d848d95..55be7df 100644 --- a/include/idzebra/version.h +++ b/include/idzebra/version.h @@ -1,4 +1,4 @@ -/* $Id: version.h,v 1.26 2007-09-19 10:03:45 adam Exp $ +/* $Id: version.h,v 1.27 2007-11-15 08:53:25 adam Exp $ Copyright (C) 1995-2007 Index Data ApS @@ -28,9 +28,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA YAZ_BEGIN_CDECL -#define ZEBRAVER "2.0.18" +#define ZEBRAVER "2.0.19" -#define ZEBRADATE "$Date: 2007-09-19 10:03:45 $" +#define ZEBRADATE "$Date: 2007-11-15 08:53:25 $" /** \brief Returns Zebra version and system info. \param version_str buffer for version (at least 16 bytes) diff --git a/index/rpnsearch.c b/index/rpnsearch.c index b9350c8..7858cfd 100644 --- a/index/rpnsearch.c +++ b/index/rpnsearch.c @@ -1,4 +1,4 @@ -/* $Id: rpnsearch.c,v 1.22 2007-11-13 13:41:51 adam Exp $ +/* $Id: rpnsearch.c,v 1.23 2007-11-15 08:53:25 adam Exp $ Copyright (C) 1995-2007 Index Data ApS @@ -1137,7 +1137,7 @@ static ZEBRA_RES string_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, { WRBUF pr_wr = wrbuf_alloc(); - wrbuf_verbose_str(pr_wr, wrbuf_buf(term_dict), wrbuf_len(term_dict)); + wrbuf_write_escaped(pr_wr, wrbuf_buf(term_dict), wrbuf_len(term_dict)); yaz_log(YLOG_LOG, "dict_lookup_grep: %s", wrbuf_cstr(pr_wr)); wrbuf_destroy(pr_wr); } diff --git a/util/zebramap.c b/util/zebramap.c index ae74a27..fd62d4a 100644 --- a/util/zebramap.c +++ b/util/zebramap.c @@ -1,4 +1,4 @@ -/* $Id: zebramap.c,v 1.71 2007-11-08 21:21:58 adam Exp $ +/* $Id: zebramap.c,v 1.72 2007-11-15 08:53:26 adam Exp $ Copyright (C) 1995-2007 Index Data ApS @@ -663,8 +663,8 @@ int zebra_map_tokenize(zebra_map_t zm, if (zm->debug) { wrbuf_rewind(zm->print_str); - wrbuf_verbose_str(zm->print_str, wrbuf_buf(zm->input_str), - wrbuf_len(zm->input_str)); + wrbuf_write_escaped(zm->print_str, wrbuf_buf(zm->input_str), + wrbuf_len(zm->input_str)); yaz_log(YLOG_LOG, "input %s", wrbuf_cstr(zm->print_str)); @@ -685,7 +685,7 @@ int zebra_map_tokenize(zebra_map_t zm, if (zm->debug) { wrbuf_rewind(zm->print_str); - wrbuf_verbose_str(zm->print_str, *result_buf, *result_len); + wrbuf_write_escaped(zm->print_str, *result_buf, *result_len); yaz_log(YLOG_LOG, "output %s", wrbuf_cstr(zm->print_str)); } -- 1.7.10.4