Dynamic logging and minor cleaning

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

diff --git a/rset/rsisamb.c b/rset/rsisamb.c
index e39ac6b..ee0762a 100644 (file)
--- a/rset/rsisamb.c
+++ b/rset/rsisamb.c
@@ -1,4 +1,4 @@
-/* $Id: rsisamb.c,v 1.19 2004-08-31 10:43:39 heikki Exp $
+/* $Id: rsisamb.c,v 1.26 2004-11-04 13:54:08 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -23,33 +23,26 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 #include <assert.h>
 #include <zebrautl.h>
-#include <rsisamb.h>
+#include <rset.h>
 #include <string.h>
-#include <../index/index.h> /* for log_keydump. Debugging only */
 
-#ifndef RSET_DEBUG
-#define RSET_DEBUG 0
-#endif
 
 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_forward(RSFD rfd, void *buf,
-                     int (*cmpfunc)(const void *p1, const void *p2),
-                     const void *untilbuf);
+static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf);
 static void r_pos (RSFD rfd, double *current, double *total);
-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 const struct rset_control control = 
 {
     "isamb",
     r_delete,
+    rset_get_one_term,
     r_open,
     r_close,
-    r_rewind,
-    r_forward, /* rset_default_forward, */
+    r_forward, 
     r_pos,
     r_read,
     r_write,
@@ -65,28 +58,32 @@ struct rset_pp_info {
 struct rset_isamb_info {
     ISAMB   is;
     ISAMB_P pos;
-    int key_size;
-    int (*cmp)(const void *p1, const void *p2);
 };
 
-RSET rsisamb_create( NMEM nmem, int key_size, 
-            int (*cmp)(const void *p1, const void *p2),
-            ISAMB is, ISAMB_P pos)
+static int log_level=0;
+static int log_level_initialized=0;
+
+RSET rsisamb_create( NMEM nmem, const struct key_control *kcontrol, int scope,
+            ISAMB is, ISAMB_P pos, TERMID term)
 {
-    RSET rnew=rset_create_base(&control, nmem);
+    RSET rnew=rset_create_base(&control, nmem, kcontrol, scope, term);
     struct rset_isamb_info *info;
+    if (!log_level_initialized)
+    {
+        log_level=yaz_log_module_level("rsisamb");
+        log_level_initialized=1;
+    }
     info = (struct rset_isamb_info *) nmem_malloc(rnew->nmem,sizeof(*info));
-    info->key_size = key_size;
-    info->cmp = cmp;
     info->is=is;
     info->pos=pos;
     rnew->priv=info;
+    logf(log_level,"rsisamb_create");
     return rnew;
 }
 
 static void r_delete (RSET ct)
 {
-    logf (LOG_DEBUG, "rsisamb_delete");
+    logf (log_level, "rsisamb_delete");
 }
 
 RSFD r_open (RSET ct, int flag)
@@ -104,11 +101,12 @@ RSFD r_open (RSET ct, int flag)
     if (rfd->priv)
         ptinfo=(struct rset_pp_info *) (rfd->priv);
     else {
-        ptinfo = (struct rset_pp_info *) nmem_malloc (ct->nmem,sizeof(*ptinfo));
-        ptinfo->buf = nmem_malloc (ct->nmem,info->key_size);
+        ptinfo = (struct rset_pp_info *)nmem_malloc(ct->nmem,sizeof(*ptinfo));
+        ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size);
         rfd->priv=ptinfo;
     }
-    ptinfo->pt = isamb_pp_open (info->is, info->pos);
+    ptinfo->pt = isamb_pp_open (info->is, info->pos, ct->scope );
+    logf(log_level,"rsisamb_open");
     return rfd;
 }
 
@@ -117,21 +115,19 @@ static void r_close (RSFD rfd)
     struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
     isamb_pp_close (ptinfo->pt);
     rfd_delete_base(rfd);
+    logf(log_level,"rsisamb_close");
 }
 
 
-static void r_rewind (RSFD rfd)
-{   
-    logf (LOG_DEBUG, "rsisamb_rewind");
-    abort ();
-}
-
-static int r_forward(RSFD rfd, void *buf, 
-                     int (*cmpfunc)(const void *p1, const void *p2),
-                     const void *untilbuf)
+static int r_forward(RSFD rfd, void *buf, TERMID *term, const void *untilbuf)
 {
     struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
-    return isamb_pp_forward(pinfo->pt, buf, untilbuf);
+    int rc;
+    rc=isamb_pp_forward(pinfo->pt, buf, untilbuf);
+    if (rc && term)
+        *term=rfd->rset->term;
+    logf(log_level,"rsisamb_forward");
+    return rc; 
 }
 
 static void r_pos (RSFD rfd, double *current, double *total)
@@ -139,17 +135,19 @@ static void r_pos (RSFD rfd, double *current, double *total)
     struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
     assert(rfd);
     isamb_pp_pos(pinfo->pt, current, total);
-#if RSET_DEBUG
-    logf(LOG_DEBUG,"isamb.r_pos returning %0.1f/%0.1f",
+    logf(log_level,"isamb.r_pos returning %0.1f/%0.1f",
               *current, *total);
-#endif
 }
 
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
 {
     struct rset_pp_info *pinfo=(struct rset_pp_info *)(rfd->priv);
-
-    return isamb_pp_read(pinfo->pt, buf);
+    int rc;
+    rc=isamb_pp_read(pinfo->pt, buf);
+    if (rc && term)
+        *term=rfd->rset->term;
+    logf(log_level,"isamb.r_read ");
+    return rc;
 }
 
 static int r_write (RSFD rfd, const void *buf)