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

diff --git a/rset/rsisams.c b/rset/rsisams.c
index 1a3ec60..79ee4f4 100644
--- a/rset/rsisams.c
+++ b/rset/rsisams.c
@@ -1,37 +1,48 @@
-/*
- * 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.10 2004-08-24 14:25:16 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>
-#include <rsisams.h>
 #include <zebrautl.h>
+#include <rsisams.h>
 
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
 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_read (RSFD rfd, void *buf);
 static int r_write (RSFD rfd, const void *buf);
 
 static const struct rset_control control = 
 {
     "isams",
-    r_create,
     r_open,
     r_close,
     r_delete,
     r_rewind,
-    r_count,
+    rset_default_forward,
+    rset_default_pos,
     r_read,
     r_write,
 };
@@ -50,40 +61,62 @@ struct rset_isams_info {
     struct rset_pp_info *ispt_list;
 };
 
+
+RSET rsisams_create( NMEM nmem, int key_size, 
+            int (*cmp)(const void *p1, const void *p2),
+            ISAMS is, ISAMS_P pos)
+{
+    RSET rnew=rset_create_base(&control, nmem);
+    struct rset_isams_info *info;
+    info = (struct rset_isams_info *) nmem_malloc(rnew->nmem,sizeof(*info));
+    assert(key_size); /* FIXME - these belong to the general rset */
+    assert(cmp);
+    info->is=is;
+    info->pos=pos;
+    info->ispt_list = NULL;
+    rnew->priv=info;
+    return rnew;
+}
+
+static void r_delete (RSET ct)
+{
+    struct rset_isams_info *info = (struct rset_isams_info *) ct->priv;
+
+    logf (LOG_DEBUG, "rsisams_delete");
+    assert (info->ispt_list == NULL);
+    /* xfree (info); */
+}
+
+#if 0
 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[0] = pt->rset_term;
     return info;
 }
+#endif
 
 RSFD r_open (RSET ct, int flag)
 {
-    struct rset_isams_info *info = ct->buf;
+    struct rset_isams_info *info = (struct rset_isams_info *) ct->priv;
     struct rset_pp_info *ptinfo;
 
     logf (LOG_DEBUG, "risams_open");
     if (flag & RSETF_WRITE)
     {
-	logf (LOG_FATAL, "ISAMS set type is read-only");
-	return NULL;
+        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);
     ptinfo->info = info;
-    if (ct->rset_terms[0]->nn < 0)
-	ct->rset_terms[0]->nn = isams_pp_num (ptinfo->pt);
     return ptinfo;
 }
 
@@ -104,31 +137,15 @@ static void r_close (RSFD rfd)
     assert (0);
 }
 
-static void r_delete (RSET ct)
-{
-    struct rset_isams_info *info = ct->buf;
-
-    logf (LOG_DEBUG, "rsisams_delete");
-    assert (info->ispt_list == NULL);
-    rset_term_destroy (ct->rset_terms[0]);
-    xfree (ct->rset_terms);
-    xfree (info);
-}
-
 static void r_rewind (RSFD rfd)
 {   
     logf (LOG_DEBUG, "rsisams_rewind");
     abort ();
 }
 
-static int r_count (RSET ct)
-{
-    return 0;
-}
 
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static int r_read (RSFD rfd, void *buf)
 {
-    *term_index = 0;
     return isams_pp_read( ((struct rset_pp_info*) rfd)->pt, buf);
 }