Moved zebrautl.h to idzebra/util.h.

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

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index 126066e..7eafe1d 100644 (file)
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,6 +1,6 @@
-/* $Id: rsisamc.c,v 1.23 2004-08-31 10:43:39 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: rsisamc.c,v 1.36 2005-03-30 09:25:24 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -26,14 +26,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
-#include <zebrautl.h>
-#include <rsisamc.h>
+#include <idzebra/util.h>
+#include <rset.h>
 
 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,
@@ -54,43 +53,38 @@ const struct rset_control *rset_kind_isamc = &control;
 
 struct rset_pp_info {
     ISAMC_PP pt;
-    struct rset_pp_info *next;
-    struct rset_isamc_info *info;
     void *buf;
 };
 
 struct rset_isamc_info {
     ISAMC   is;
     ISAMC_P pos;
-    int key_size;
-    int (*cmp)(const void *p1, const void *p2);
-    struct rset_pp_info *ispt_list;
-    struct rset_pp_info *free_list;
 };
 
-RSET rsisamc_create( NMEM nmem, int key_size, 
-            int (*cmp)(const void *p1, const void *p2),
-            ISAMC is, 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, TERMID term)
 {
-    RSET rnew=rset_create_base(&control, nmem);
+    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->key_size = key_size;
-    info->cmp = cmp;
-    info->ispt_list = NULL;
-    info->free_list = NULL;
-    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)
 {
-    struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv;
-
-    logf (LOG_DEBUG, "rsisamc_delete");
-    assert (info->ispt_list == NULL);
+    yaz_log(log_level, "rsisamc_delete");
 }
 
 
@@ -100,54 +94,55 @@ RSFD r_open (RSET ct, int flag)
     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;
-        ptinfo->buf = nmem_malloc (ct->nmem,info->key_size);
+        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 void r_rewind (RSFD rfd)
-{   
-    logf (LOG_DEBUG, "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);
+    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;
 }
+
+
+