X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisams.c;h=30f3cd704d901e9b26125c4b8fd9b070dcbec885;hb=70ba74c9bbf739fbe82d1bc2b0fb64a547c0c9e0;hp=1a3ec60fcf3f0e187eb79c6343e6536d8a8d7685;hpb=d9d2a1764247c9e849ecaa429054579367734191;p=idzebra-moved-to-github.git

diff --git a/rset/rsisams.c b/rset/rsisams.c
index 1a3ec60..30f3cd7 100644
--- a/rset/rsisams.c
+++ b/rset/rsisams.c
@@ -1,13 +1,26 @@
-/*
- * Copyright (C) 1994-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsisams.c,v $
- * Revision 1.1  1999-05-12 15:24:25  adam
- * First version of ISAMS.
- *
- */
+/* $Id: rsisams.c,v 1.6 2004-08-03 14:54:41 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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.
+*/
+
+
 
 #include <stdio.h>
 #include <assert.h>
@@ -19,7 +32,6 @@ 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_count (RSET ct);
 static int r_read (RSFD rfd, void *buf, int *term_index);
 static int r_write (RSFD rfd, const void *buf);
 
@@ -31,7 +43,8 @@ static const struct rset_control control =
     r_close,
     r_delete,
     r_rewind,
-    r_count,
+    rset_default_forward,
+    rset_default_pos,
     r_read,
     r_write,
 };
@@ -52,23 +65,23 @@ struct rset_isams_info {
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
 {
-    rset_isams_parms *pt = parms;
+    rset_isams_parms *pt = (struct rset_isams_parms *) parms;
     struct rset_isams_info *info;
 
     ct->flags |= RSET_FLAG_VOLATILE;
-    info = xmalloc (sizeof(*info));
+    info = (struct rset_isams_info *) xmalloc (sizeof(*info));
     info->is = pt->is;
     info->pos = pt->pos;
     info->ispt_list = NULL;
     ct->no_rset_terms = 1;
-    ct->rset_terms = xmalloc (sizeof(*ct->rset_terms));
+    ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
     ct->rset_terms[0] = pt->rset_term;
     return info;
 }
 
 RSFD r_open (RSET ct, int flag)
 {
-    struct rset_isams_info *info = ct->buf;
+    struct rset_isams_info *info = (struct rset_isams_info *) ct->buf;
     struct rset_pp_info *ptinfo;
 
     logf (LOG_DEBUG, "risams_open");
@@ -77,7 +90,7 @@ RSFD r_open (RSET ct, int flag)
 	logf (LOG_FATAL, "ISAMS set type is read-only");
 	return NULL;
     }
-    ptinfo = xmalloc (sizeof(*ptinfo));
+    ptinfo = (struct rset_pp_info *) xmalloc (sizeof(*ptinfo));
     ptinfo->next = info->ispt_list;
     info->ispt_list = ptinfo;
     ptinfo->pt = isams_pp_open (info->is, info->pos);
@@ -106,7 +119,7 @@ static void r_close (RSFD rfd)
 
 static void r_delete (RSET ct)
 {
-    struct rset_isams_info *info = ct->buf;
+    struct rset_isams_info *info = (struct rset_isams_info *) ct->buf;
 
     logf (LOG_DEBUG, "rsisams_delete");
     assert (info->ispt_list == NULL);
@@ -121,10 +134,6 @@ static void r_rewind (RSFD rfd)
     abort ();
 }
 
-static int r_count (RSET ct)
-{
-    return 0;
-}
 
 static int r_read (RSFD rfd, void *buf, int *term_index)
 {