X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=d005fb9f976705291645f69afdcf1fbb5a1cd027;hb=a8b86c35a39ce9eb5279c46dd99ef7e91b83fb7b;hp=110bbcd18d3e709974ec7f9adb46be7d01597c1f;hpb=81a75ae20b5b250309a70de51bfdf8de0019f882;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index 110bbcd..d005fb9 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,13 +1,31 @@
-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- *
- * $Id: rsisamc.c,v 1.11 2002-04-05 08:46:26 adam Exp $
- */
+/* $Id: rsisamc.c,v 1.17 2004-08-06 12:55:03 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+   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>
+#include <string.h>
 #include <zebrautl.h>
 #include <rsisamc.h>
 
@@ -16,7 +34,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);
 
@@ -28,7 +45,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,
 };
@@ -39,7 +57,7 @@ struct rset_pp_info {
     ISAMC_PP pt;
     struct rset_pp_info *next;
     struct rset_isamc_info *info;
-    int *countp;
+    zint *countp;
     void *buf;
 };
 
@@ -128,11 +146,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)
 {
     struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;