X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsbetween.c;h=9c778be7810fddcb1963dc997627f683916a9dd5;hp=e2411fd8b6aff3c910a1aa0fcf26438f29707bb7;hb=4478d785b7769691261005c98063b98a5a5971b3;hpb=2cd05dfd682c368fd3bd73912144344d2954325f

diff --git a/rset/rsbetween.c b/rset/rsbetween.c
index e2411fd..9c778be 100644
--- a/rset/rsbetween.c
+++ b/rset/rsbetween.c
@@ -1,5 +1,5 @@
-/* $Id: rsbetween.c,v 1.40 2005-06-06 21:31:08 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
+
 */
 
 
@@ -96,15 +96,15 @@ static void checkterm(RSET rs, char *tag, NMEM nmem)
 {
     if (!rs->term)
     {
-        rs->term = rset_term_create(tag, strlen(tag), "", 0, nmem, 0);
+        rs->term = rset_term_create(tag, -1, "", 0, nmem, 0, 0, 0, 0);
         rs->term->rset = rs;
     }
 }
 
 
-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;
@@ -323,3 +323,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
+ */
+