X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frsisamc.c;h=9e5d426c990e2631f9c3a01571573ff3e9d938c3;hp=4e8b827ec4d3a767446308d882cf5e3ab330c6b3;hb=d02c4c703a93e0ad3f4ccde4519879f1f57a6824;hpb=0229bb1ac74706a4e460a11a8a8712b4ea0f2ebe

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index 4e8b827..9e5d426 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,8 +1,5 @@
-/* $Id: rsisamc.c,v 1.27 2004-10-15 10:07:34 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -15,18 +12,18 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 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
 
+*/
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
 #include <rset.h>
 
 static RSFD r_open (RSET ct, int flag);
@@ -36,20 +33,19 @@ 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);
 
-static const struct rset_control control = 
+static const struct rset_control control =
 {
     "isamc",
     r_delete,
+    rset_get_one_term,
     r_open,
     r_close,
-    rset_default_forward,
+    0, /* no forward */
     r_pos,
     r_read,
     r_write,
 };
 
-const struct rset_control *rset_kind_isamc = &control;
-
 struct rset_pp_info {
     ISAMC_PP pt;
     void *buf;
@@ -57,77 +53,100 @@ struct rset_pp_info {
 
 struct rset_isamc_info {
     ISAMC   is;
-    ISAMC_P pos;
+    ISAM_P pos;
 };
 
-RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol, int scope,
-                             ISAMC is, ISAMC_P pos, TERMID term)
+static int log_level = 0;
+static int log_level_initialized = 0;
+
+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;
-    info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info));
-    info->is=is;
-    info->pos=pos;
-    rnew->priv=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;
+    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 = isamc_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);
-    rfd_delete_base(rfd);
+    isamc_pp_close(p->pt);
 }
 
 
 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);
+    r = isamc_pp_read(p->pt, buf);
     if (term)
-        *term=rfd->rset->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;
 }
 
+
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+