X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsbetween.c;h=8d0ffe678843dab0f7c21e8c744799157f64b917;hb=3ef0c861c68e520a9a1cb0fa523251a2d3d739ee;hp=a03bea18b105cf2bd22f9e63d484405c04a63ec1;hpb=2cb08a89ee65d8ae2646b91dcf27bc3883759691;p=idzebra-moved-to-github.git

diff --git a/rset/rsbetween.c b/rset/rsbetween.c
index a03bea1..8d0ffe6 100644
--- a/rset/rsbetween.c
+++ b/rset/rsbetween.c
@@ -1,4 +1,4 @@
-/* $Id: rsbetween.c,v 1.39 2005-05-24 11:35:43 adam Exp $
+/* $Id: rsbetween.c,v 1.44 2006-06-06 21:01:30 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -92,19 +92,19 @@ static int log_level_initialized = 0;
 
 /* make sure that the rset has a term attached. If not, create one */
 /* we need these terms for the tags, to distinguish what we read */
-static void checkterm( RSET rs, char *tag, NMEM nmem)
+static void checkterm(RSET rs, char *tag, NMEM nmem)
 {
     if (!rs->term)
     {
-        rs->term = rset_term_create(tag, strlen(tag), "", 0, nmem);
+        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
+ */
+