X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=beecdc5e0afd58a6abed1d564d9ba30d22bc6dbe;hb=de79197bd3ee5ef00d6d6353ef4f83d035fe4e1c;hp=b60f9394cf57cd011b516438d6a92ae6bdd36be8;hpb=c8b510c1c66a9119ede10b63975fc5f7f1ea49f5;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index b60f939..beecdc5 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,4 +1,4 @@
-/* $Id: rsisamc.c,v 1.38 2005-04-26 10:09:38 adam Exp $
+/* $Id: rsisamc.c,v 1.41 2006-05-10 08:13:33 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -40,7 +40,7 @@ static const struct rset_control control =
     rset_get_one_term,
     r_open,
     r_close,
-    rset_default_forward,
+    0, /* no forward */
     r_pos,
     r_read,
     r_write,
@@ -59,17 +59,18 @@ struct rset_isamc_info {
 static int log_level = 0;
 static int log_level_initialized = 0;
 
-RSET rsisamc_create(NMEM nmem, const struct key_control *kcontrol, int scope,
+RSET rsisamc_create(NMEM nmem, struct rset_key_control *kcontrol,
+		    int scope,
 		    ISAMC is, ISAM_P pos, TERMID term)
 {
-    RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,term);
+    RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term, 0, 0);
     struct rset_isamc_info *info;
     if (!log_level_initialized)
     {
         log_level = yaz_log_module_level("rsisamc");
         log_level_initialized = 1;
     }
-    info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info));
+    info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem, sizeof(*info));
     info->is = is;
     info->pos = pos;
     rnew->priv = info;
@@ -112,7 +113,6 @@ static void r_close (RSFD rfd)
     struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv);
 
     isamc_pp_close(p->pt);
-    rfd_delete_base(rfd);
 }
 
 
@@ -141,3 +141,11 @@ static void r_pos (RSFD rfd, double *current, double *total)
 
 
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+