X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=fc5ad178d7578285533bcd88218fd459031c0127;hb=d195e3229385349f842d2f82b65ad8118d64aec5;hp=96799476a777c1fdf59c8f5da827ab90172e5d47;hpb=d50126fa619f94079daa731d66c305e86a38a85a;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index 9679947..fc5ad17 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,5 +1,5 @@
-/* $Id: rsisamc.c,v 1.26 2004-09-30 09:53:05 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+/* $Id: rsisamc.c,v 1.34 2005-01-11 14:03:04 adam Exp $
+   Copyright (C) 1995-2005
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -32,7 +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 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);
 
@@ -40,6 +40,7 @@ static const struct rset_control control =
 {
     "isamc",
     r_delete,
+    rset_get_one_term,
     r_open,
     r_close,
     rset_default_forward,
@@ -60,72 +61,88 @@ 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;
+    info->is = is;
+    info->pos = pos;
+    rnew->priv = info;
+    yaz_log(log_level, "create: term=%p", term);
     return rnew;
 }
 
 static void r_delete (RSET ct)
 {
-    logf (LOG_DEBUG, "rsisamc_delete");
+    yaz_log(log_level, "rsisamc_delete");
 }
 
 
 RSFD r_open (RSET ct, int flag)
 {
+    struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv;
     RSFD rfd;
     struct rset_pp_info *ptinfo;
 
-    logf (LOG_DEBUG, "risamc_open");
+    yaz_log(log_level, "risamc_open");
     if (flag & RSETF_WRITE)
     {
-        logf (LOG_FATAL, "ISAMC set type is read-only");
+        yaz_log(YLOG_FATAL, "ISAMC set type is read-only");
         return NULL;
     }
     rfd = rfd_create_base(ct);
     if (rfd->priv)
-        ptinfo=(struct rset_pp_info *)rfd->priv;
+        ptinfo = (struct rset_pp_info *)rfd->priv;
     else {
         ptinfo = (struct rset_pp_info *) nmem_malloc (ct->nmem,sizeof(*ptinfo));
-        rfd->priv=ptinfo;
+        rfd->priv = ptinfo;
         ptinfo->buf = nmem_malloc (ct->nmem,ct->keycontrol->key_size);
     }
+    ptinfo->pt = isc_pp_open(info->is, info->pos);
     return rfd;
 }
 
 static void r_close (RSFD rfd)
 {
-    struct rset_pp_info *p=(struct rset_pp_info *)(rfd->priv);
+    struct rset_pp_info *p = (struct rset_pp_info *)(rfd->priv);
 
-    isc_pp_close (p->pt);
+    isc_pp_close(p->pt);
     rfd_delete_base(rfd);
 }
 
 
-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);
+    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;
+    yaz_log(log_level, "isamc.r_read");
     return r;
 }
 
 static int r_write (RSFD rfd, const void *buf)
 {
-    logf (LOG_FATAL, "ISAMC set type is read-only");
+    yaz_log(YLOG_FATAL, "ISAMC set type is read-only");
     return -1;
 }
 
 static void r_pos (RSFD rfd, double *current, double *total)
 {
-    *current=-1;  /* sorry, not implemented yet */
-    *total=-1;
+    *current = -1;  /* sorry, not implemented yet */
+    *total = -1;
 }
 
+
+