-/* $Id: rsbetween.c,v 1.39 2005-05-24 11:35:43 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: rsbetween.c,v 1.46 2007-01-15 15:10:19 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
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
+
*/
/* 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=
}
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;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+