X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsbetween.c;h=f8e1f6b1403b025558cd0cd1c02821c609979d30;hp=2117dc81620e686e443d34b41f9a0ddf87e4f2d7;hb=89d16cf15eda0e4802d18b8ad09bd3653508ebfc;hpb=3f385c9ee5fea1f18f200a598747c9b385eee9d8

diff --git a/rset/rsbetween.c b/rset/rsbetween.c
index 2117dc8..f8e1f6b 100644
--- a/rset/rsbetween.c
+++ b/rset/rsbetween.c
@@ -1,8 +1,5 @@
-/* $Id: rsbetween.c,v 1.42 2005-06-22 19:42:39 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2009 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,9 +12,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 +99,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 +138,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;
@@ -323,3 +320,11 @@ static void r_get_terms(RSET ct, TERMID *terms, int maxterms, int *curterm)
 }
 
  
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+