New rsbeween implementation. Much shorter and easier, and works well

[idzebra-moved-to-github.git] / rset / rsisamc.c

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index c7fb530..6b833d6 100644 (file)
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,4 +1,4 @@
-/* $Id: rsisamc.c,v 1.25 2004-09-09 10:08:06 heikki Exp $
+/* $Id: rsisamc.c,v 1.30 2004-11-04 13:54:08 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -32,8 +32,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 static RSFD r_open (RSET ct, int flag);
 static void r_close (RSFD rfd);
 static void r_delete (RSET ct);
-static void r_rewind (RSFD rfd);
-static int r_read (RSFD rfd, void *buf);
+static int r_read (RSFD rfd, void *buf, TERMID *term);
 static int r_write (RSFD rfd, const void *buf);
 static void r_pos (RSFD rfd, double *current, double *total);
 
@@ -41,9 +40,9 @@ static const struct rset_control control =
 {
     "isamc",
     r_delete,
+    rset_get_one_term,
     r_open,
     r_close,
-    r_rewind,
     rset_default_forward,
     r_pos,
     r_read,
@@ -62,21 +61,30 @@ struct rset_isamc_info {
     ISAMC_P pos;
 };
 
+static int log_level=0;
+static int log_level_initialized=0;
+
 RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol, int scope,
-                             ISAMC is, ISAMC_P pos)
+                             ISAMC is, ISAMC_P pos, TERMID term)
 {
-    RSET rnew=rset_create_base(&control, nmem, kcontrol, scope);
+    RSET rnew=rset_create_base(&control, nmem, kcontrol, scope,term);
     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->is=is;
     info->pos=pos;
     rnew->priv=info;
+    logf(log_level, "create: term=%p", term);
     return rnew;
 }
 
 static void r_delete (RSET ct)
 {
-    logf (LOG_DEBUG, "rsisamc_delete");
+    logf (log_level, "rsisamc_delete");
 }
 
 
@@ -85,7 +93,7 @@ RSFD r_open (RSET ct, int flag)
     RSFD rfd;
     struct rset_pp_info *ptinfo;
 
-    logf (LOG_DEBUG, "risamc_open");
+    logf (log_level, "risamc_open");
     if (flag & RSETF_WRITE)
     {
         logf (LOG_FATAL, "ISAMC set type is read-only");
@@ -111,17 +119,14 @@ static void r_close (RSFD rfd)
 }
 
 
-static void r_rewind (RSFD rfd)
-{   
-    logf (LOG_FATAL, "rsisamc_rewind");
-    abort ();
-}
-
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
 {
     struct rset_pp_info *p=(struct rset_pp_info *)(rfd->priv);
     int r;
     r = isc_pp_read(p->pt, buf);
+    if (term)
+        *term=rfd->rset->term;
+    logf(log_level,"read returning term %p", *term);
     return r;
 }
 
@@ -137,3 +142,5 @@ static void r_pos (RSFD rfd, double *current, double *total)
     *total=-1;
 }
 
+
+