X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsm_or.c;h=1fee32e6d78456e7a9a9742088a26a7b69c3e559;hb=b5eb8cd7ae4134d915ed8b4aec25ab90c8bd0dcb;hp=5232aa061d69b3528a436d416cc5c1a4ca170749;hpb=f1a944fbdac20e88bf55918f2a4f66c301d684e2;p=idzebra-moved-to-github.git

diff --git a/rset/rsm_or.c b/rset/rsm_or.c
index 5232aa0..1fee32e 100644
--- a/rset/rsm_or.c
+++ b/rset/rsm_or.c
@@ -1,11 +1,26 @@
-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: rsm_or.c,v 1.11 2002-03-20 20:24:30 adam Exp $
- *
- */
+/* $Id: rsm_or.c,v 1.18 2004-08-06 13:14:47 adam 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 <assert.h>
@@ -14,8 +29,6 @@
 #include <string.h>
 
 #include <zebrautl.h>
-#if ZMBOL
-#include <isam.h>
 #include <isamc.h>
 #include <rsm_or.h>
 
@@ -24,7 +37,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);
 
@@ -36,7 +48,8 @@ static const struct rset_control control =
     r_close,
     r_delete,
     r_rewind,
-    r_count,
+    rset_default_forward, /* FIXME */
+    rset_default_pos, /* FIXME */
     r_read,
     r_write,
 };
@@ -48,7 +61,7 @@ struct rset_mor_info {
     int     no_rec;
     int     (*cmp)(const void *p1, const void *p2);
     ISAMC   isc;
-    ISAM_P  *isam_positions;
+    ISAMC_P *isam_positions;
 
     int     no_isam_positions;
     int     no_save_positions;
@@ -75,7 +88,7 @@ struct rset_mor_rfd {
     struct rset_mor_rfd *next;
     struct rset_mor_info *info;
     struct trunc_info *ti;
-    int  *countp;
+    zint *countp;
     char *pbuf;
 };
 
@@ -178,7 +191,7 @@ static void *r_create (RSET ct, const struct rset_control *sel, void *parms)
 
     info->isc = r_parms->isc;
     info->no_isam_positions = r_parms->no_isam_positions;
-    info->isam_positions = (ISAM_P *)
+    info->isam_positions = (ISAMC_P *)
 	xmalloc (sizeof(*info->isam_positions) * info->no_isam_positions);
     memcpy (info->isam_positions, r_parms->isam_positions,
             sizeof(*info->isam_positions) * info->no_isam_positions);
@@ -282,10 +295,6 @@ static void r_rewind (RSFD rfd)
 {
 }
 
-static int r_count (RSET ct)
-{
-    return 0;
-}
 
 static int r_read (RSFD rfd, void *buf, int *term_index)
 {
@@ -344,4 +353,3 @@ static int r_write (RSFD rfd, const void *buf)
     logf (LOG_FATAL, "mor set type is read-only");
     return -1;
 }
-#endif