X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisams.c;h=5fd70cf94fcae151fd6f413fe48f9688945d7a6e;hb=2cd05dfd682c368fd3bd73912144344d2954325f;hp=e6031e1f23e0e4de0aa9859475a307a92bb564d3;hpb=70effaa5a4a18f1bef9c6111dc082bb8714e4c19;p=idzebra-moved-to-github.git

diff --git a/rset/rsisams.c b/rset/rsisams.c
index e6031e1..5fd70cf 100644
--- a/rset/rsisams.c
+++ b/rset/rsisams.c
@@ -1,6 +1,6 @@
-/* $Id: rsisams.c,v 1.11 2004-08-31 10:43:39 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: rsisams.c,v 1.23 2005-05-24 11:35:43 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -20,18 +20,15 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #include <stdio.h>
 #include <assert.h>
-#include <zebrautl.h>
-#include <rsisams.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);
 
@@ -39,66 +36,60 @@ static const struct rset_control control =
 {
     "isams",
     r_delete,
+    rset_get_one_term,
     r_open,
     r_close,
-    r_rewind,
-    rset_default_forward,
+    0, /* no foward */
     r_pos,
     r_read,
     r_write,
 };
 
-const struct rset_control *rset_kind_isams = &control;
-
-struct rset_pp_info {
+struct rfd_private {
     ISAMS_PP pt;
 };
 
-struct rset_isams_info {
+struct rset_private {
     ISAMS   is;
-    ISAMS_P pos;
+    ISAM_P pos;
 };
 
 
-RSET rsisams_create( NMEM nmem, int key_size, 
-            int (*cmp)(const void *p1, const void *p2),
-            ISAMS is, ISAMS_P pos)
+RSET rsisams_create(NMEM nmem, struct rset_key_control *kcontrol,
+		    int scope,
+		    ISAMS is, ISAM_P pos, TERMID term)
 {
-    RSET rnew=rset_create_base(&control, nmem);
-    struct rset_isams_info *info;
-    info = (struct rset_isams_info *) nmem_malloc(rnew->nmem,sizeof(*info));
-    assert(key_size); /* FIXME - these belong to the general rset */
-    assert(cmp);
-    info->is=is;
-    info->pos=pos;
-    rnew->priv=info;
+    RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term, 0, 0);
+    struct rset_private *info;
+    info = (struct rset_private *) nmem_malloc(rnew->nmem,sizeof(*info));
+    rnew->priv = info;
+    info->is = is;
+    info->pos = pos;
     return rnew;
 }
 
 static void r_delete (RSET ct)
 {
-    logf (LOG_DEBUG, "rsisams_delete");
-    rset_delete(ct);
+    yaz_log (YLOG_DEBUG, "rsisams_delete");
 }
 
-
 RSFD r_open (RSET ct, int flag)
 {
-    struct rset_isams_info *info = (struct rset_isams_info *) ct->priv;
+    struct rset_private *info = (struct rset_private *) ct->priv;
     RSFD rfd;
-    struct rset_pp_info *ptinfo;
+    struct rfd_private *ptinfo;
 
-    logf (LOG_DEBUG, "risams_open");
+    yaz_log (YLOG_DEBUG, "risams_open");
     if (flag & RSETF_WRITE)
     {
-        logf (LOG_FATAL, "ISAMS set type is read-only");
+        yaz_log (YLOG_FATAL, "ISAMS set type is read-only");
         return NULL;
     }
     rfd=rfd_create_base(ct);
     if (rfd->priv)
-        ptinfo=(struct rset_pp_info *)(rfd->priv);
+        ptinfo=(struct rfd_private *)(rfd->priv);
     else {
-        ptinfo = (struct rset_pp_info *) nmem_malloc(ct->nmem,sizeof(*ptinfo));
+        ptinfo = (struct rfd_private *) nmem_malloc(ct->nmem,sizeof(*ptinfo));
         ptinfo->pt = isams_pp_open (info->is, info->pos);
         rfd->priv=ptinfo;
     }
@@ -107,28 +98,25 @@ RSFD r_open (RSET ct, int flag)
 
 static void r_close (RSFD rfd)
 {
-    struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
+    struct rfd_private *ptinfo = (struct rfd_private *)(rfd->priv);
 
     isams_pp_close (ptinfo->pt);
-    rfd_delete_base(rfd);
-}
-
-static void r_rewind (RSFD rfd)
-{   
-    logf (LOG_DEBUG, "rsisams_rewind");
-    abort ();
 }
 
 
-static int r_read (RSFD rfd, void *buf)
+static int r_read (RSFD rfd, void *buf, TERMID *term)
 {
-    struct rset_pp_info *ptinfo=(struct rset_pp_info *)(rfd->priv);
-    return isams_pp_read(ptinfo->pt, buf);
+    struct rfd_private *ptinfo = (struct rfd_private *)(rfd->priv);
+    int rc;
+    rc=isams_pp_read(ptinfo->pt, buf);
+    if (rc && term)
+        *term=rfd->rset->term;
+    return rc;
 }
 
 static int r_write (RSFD rfd, const void *buf)
 {
-    logf (LOG_FATAL, "ISAMS set type is read-only");
+    yaz_log (YLOG_FATAL, "ISAMS set type is read-only");
     return -1;
 }
 
@@ -137,3 +125,5 @@ static void r_pos (RSFD rfd, double *current, double *total)
     *current=-1;  /* sorry, not implemented yet */
     *total=-1;
 }
+
+