X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=d9f85db4a9e1a3326bf9ce092865d328285dc10b;hb=70ba74c9bbf739fbe82d1bc2b0fb64a547c0c9e0;hp=285fd17fa4018d630ee4940211e06f21a1ff1d5f;hpb=2b1851bd5565e3d21f9cf9a37661a584c063b75f;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index 285fd17..d9f85db 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,48 +1,32 @@
-/*
- * Copyright (C) 1994-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsisamc.c,v $
- * Revision 1.10  2002-04-04 14:14:13  adam
- * Multiple registers (alpha early)
- *
- * Revision 1.9  2002/03/20 20:24:30  adam
- * Hits per term. Returned in SearchResult-1
- *
- * Revision 1.8  1999/11/30 13:48:04  adam
- * Improved installation. Updated for inclusion of YAZ header files.
- *
- * Revision 1.7  1999/05/26 07:49:14  adam
- * C++ compilation.
- *
- * Revision 1.6  1999/02/02 14:51:35  adam
- * Updated WIN32 code specific sections. Changed header.
- *
- * Revision 1.5  1998/03/05 08:36:28  adam
- * New result set model.
- *
- * Revision 1.4  1997/12/18 10:54:25  adam
- * New method result set method rs_hits that returns the number of
- * hits in result-set (if known). The ranked result set returns real
- * number of hits but only when not combined with other operands.
- *
- * Revision 1.3  1997/10/31 12:37:01  adam
- * Code calls xfree() instead of free().
- *
- * Revision 1.2  1996/11/08 11:15:57  adam
- * Compressed isam fully supported.
- *
- * Revision 1.1  1996/10/29 13:41:48  adam
- * First use of isamc.
- *
- */
+/* $Id: rsisamc.c,v 1.16 2004-08-03 14:54:41 heikki 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>
-#if ZMBOL
 #include <rsisamc.h>
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
@@ -50,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);
 
@@ -62,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,
 };
@@ -162,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;
@@ -189,4 +168,3 @@ static int r_write (RSFD rfd, const void *buf)
     logf (LOG_FATAL, "ISAMC set type is read-only");
     return -1;
 }
-#endif