X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisams.c;h=b30df9c6ebfeeb6a672aac1e2791f019e17c85d6;hb=ecf94fc25324414287d3bbfbeba4440e558edd17;hp=683a54592a057d90b9374ffd51c327bb9c21f199;hpb=726c42c6ae793b79a5351d2fce805d220d21321e;p=idzebra-moved-to-github.git

diff --git a/rset/rsisams.c b/rset/rsisams.c
index 683a545..b30df9c 100644
--- a/rset/rsisams.c
+++ b/rset/rsisams.c
@@ -1,6 +1,6 @@
-/* $Id: rsisams.c,v 1.13 2004-09-09 10:08:06 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: rsisams.c,v 1.20 2005-04-13 13:03:50 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -24,14 +24,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <stdio.h>
 #include <assert.h>
-#include <zebrautl.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,9 +38,9 @@ static const struct rset_control control =
 {
     "isams",
     r_delete,
+    rset_get_one_term,
     r_open,
     r_close,
-    r_rewind,
     rset_default_forward,
     r_pos,
     r_read,
@@ -56,14 +55,14 @@ struct rset_pp_info {
 
 struct rset_isams_info {
     ISAMS   is;
-    ISAMS_P pos;
+    ISAM_P pos;
 };
 
 
-RSET rsisams_create( NMEM nmem, const struct key_control *kcontrol, int scope,
-            ISAMS is, ISAMS_P pos)
+RSET rsisams_create(NMEM nmem, const struct key_control *kcontrol, int scope,
+		    ISAMS is, ISAM_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_isams_info *info;
     info = (struct rset_isams_info *) nmem_malloc(rnew->nmem,sizeof(*info));
     rnew->priv=info;
@@ -74,7 +73,7 @@ RSET rsisams_create( NMEM nmem, const struct key_control *kcontrol, int scope,
 
 static void r_delete (RSET ct)
 {
-    logf (LOG_DEBUG, "rsisams_delete");
+    yaz_log (YLOG_DEBUG, "rsisams_delete");
     rset_delete(ct);
 }
 
@@ -85,10 +84,10 @@ RSFD r_open (RSET ct, int flag)
     RSFD rfd;
     struct rset_pp_info *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);
@@ -110,22 +109,20 @@ static void r_close (RSFD rfd)
     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);
+    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;
 }
 
@@ -134,3 +131,5 @@ static void r_pos (RSFD rfd, double *current, double *total)
     *current=-1;  /* sorry, not implemented yet */
     *total=-1;
 }
+
+