X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsbetween.c;h=9c778be7810fddcb1963dc997627f683916a9dd5;hp=71de9c6d8b3abf1436e9337715efa11555f96321;hb=4478d785b7769691261005c98063b98a5a5971b3;hpb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e diff --git a/rset/rsbetween.c b/rset/rsbetween.c index 71de9c6..9c778be 100644 --- a/rset/rsbetween.c +++ b/rset/rsbetween.c @@ -1,5 +1,5 @@ -/* $Id: rsbetween.c,v 1.43 2006-05-10 08:13:32 adam Exp $ - Copyright (C) 1995-2005 +/* $Id: rsbetween.c,v 1.45 2006-08-14 10:40:21 adam Exp $ + Copyright (C) 1995-2006 Index Data ApS This file is part of the Zebra server. @@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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 + */ @@ -102,9 +102,9 @@ static void checkterm(RSET rs, char *tag, NMEM nmem) } -RSET rsbetween_create(NMEM nmem, struct rset_key_control *kcontrol, - int scope, - RSET rset_l, RSET rset_m, RSET rset_r, RSET rset_attr) +RSET rset_create_between(NMEM nmem, struct rset_key_control *kcontrol, + int scope, + RSET rset_l, RSET rset_m, RSET rset_r, RSET rset_attr) { RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, 0, 0, 0); struct rset_between_info *info= @@ -141,8 +141,8 @@ RSET rsbetween_create(NMEM nmem, struct rset_key_control *kcontrol, } rnew->no_children = 1; rnew->children = nmem_malloc(rnew->nmem, sizeof(RSET *)); - rnew->children[0] = rsmulti_and_create(nmem, kcontrol, - scope, n, rsetarray); + rnew->children[0] = rset_create_and(nmem, kcontrol, + scope, n, rsetarray); rnew->priv = info; yaz_log(log_level, "create rset at %p", rnew); return rnew;