From 5547de9ea74a78fbaedeb6e07ac17d953252da99 Mon Sep 17 00:00:00 2001 From: Heikki Levanto Date: Fri, 1 Oct 2004 15:36:15 +0000 Subject: [PATCH] Added an asserion in zebra_search_rpn api --- index/zebraapi.c | 5 ++++- index/zrpn.c | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/index/zebraapi.c b/index/zebraapi.c index 9030da1..e6ee025 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,4 +1,4 @@ -/* $Id: zebraapi.c,v 1.133 2004-09-27 10:44:49 adam Exp $ +/* $Id: zebraapi.c,v 1.134 2004-10-01 15:36:15 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -785,6 +785,9 @@ int zebra_search_RPN (ZebraHandle zh, ODR o, const char *max; zint maxhits; ASSERTZH; + assert(query); + assert(hits); + assert(setname); yaz_log(LOG_API,"zebra_search_rpn"); zh->errCode=0; zh->hits = 0; diff --git a/index/zrpn.c b/index/zrpn.c index 32a5c87..2591291 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,4 +1,4 @@ -/* $Id: zrpn.c,v 1.155 2004-10-01 14:25:28 heikki Exp $ +/* $Id: zrpn.c,v 1.156 2004-10-01 15:36:15 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -1695,6 +1695,7 @@ static RSET rpn_search_APT_numeric (ZebraHandle zh, int r, rset_no = 0; struct grep_info grep_info; + logf (LOG_DEBUG, "APT_numeric t='%s'",termz); if (grep_info_prepare (zh, zapt, &grep_info, reg_type, stream)) return 0; while (1) @@ -2281,7 +2282,7 @@ RSET rpn_search (ZebraHandle zh, NMEM nmem, NMEM rset_nmem, sort_sequence = (Z_SortKeySpecList *) nmem_malloc (nmem, sizeof(*sort_sequence)); - sort_sequence->num_specs = 10; + sort_sequence->num_specs = 10; /* FIXME - Hard-coded number */ sort_sequence->specs = (Z_SortKeySpec **) nmem_malloc (nmem, sort_sequence->num_specs * sizeof(*sort_sequence->specs)); -- 1.7.10.4