X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=rset%2Frsisamc.c;h=316d1b91f9170acd47a8826116fca01e557121d3;hb=927733195c5646988dcc65365bb45b978b02a15a;hp=8099d54ec17eced81200b754f00bd087f65b2c5c;hpb=82bdd90d99e036b5c491666b5be5471c59f8e1b8;p=idzebra-moved-to-github.git

diff --git a/rset/rsisamc.c b/rset/rsisamc.c
index 8099d54..316d1b9 100644
--- a/rset/rsisamc.c
+++ b/rset/rsisamc.c
@@ -1,78 +1,114 @@
-/*
- * Copyright (C) 1994-1996, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsisamc.c,v $
- * 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.21 2004-08-24 14:25:16 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 <rsisamc.h>
+#include <string.h>
 #include <zebrautl.h>
+#include <rsisamc.h>
 
-static void *r_create(const struct rset_control *sel, void *parms,
-                      int *flags);
 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);
 static int r_write (RSFD rfd, const void *buf);
-static int r_score (RSFD rfd, int *score);
 
-static const rset_control control = 
+static const struct rset_control control = 
 {
     "isamc",
-    r_create,
     r_open,
     r_close,
     r_delete,
     r_rewind,
-    r_count,
+    rset_default_forward,
+    rset_default_pos,
     r_read,
     r_write,
-    r_score
 };
 
-const rset_control *rset_kind_isamc = &control;
+const struct rset_control *rset_kind_isamc = &control;
 
 struct rset_pp_info {
     ISAMC_PP pt;
     struct rset_pp_info *next;
     struct rset_isamc_info *info;
+    void *buf;
 };
 
 struct rset_isamc_info {
     ISAMC   is;
     ISAMC_P pos;
+    int key_size;
+    int (*cmp)(const void *p1, const void *p2);
     struct rset_pp_info *ispt_list;
 };
 
-static void *r_create(const struct rset_control *sel, void *parms,
-                      int *flags)
+RSET rsisamc_create( NMEM nmem, int key_size, 
+            int (*cmp)(const void *p1, const void *p2),
+            ISAMC is, ISAMC_P pos)
+{
+    RSET rnew=rset_create_base(&control, nmem);
+    struct rset_isamc_info *info;
+    info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info));
+    info->key_size = key_size;
+    info->cmp = cmp;
+    info->ispt_list = NULL;
+    info->is=is;
+    info->pos=pos;
+    rnew->priv=info;
+    return rnew;
+}
+
+static void r_delete (RSET ct)
+{
+    struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv;
+
+    logf (LOG_DEBUG, "rsisamc_delete");
+    assert (info->ispt_list == NULL);
+}
+
+/*
+static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
 {
-    rset_isamc_parms *pt = parms;
+    rset_isamc_parms *pt = (rset_isamc_parms *) parms;
     struct rset_isamc_info *info;
 
-    *flags |= RSET_FLAG_VOLATILE;
-    info = xmalloc (sizeof(*info));
+    info = (struct rset_isamc_info *) xmalloc (sizeof(*info));
     info->is = pt->is;
     info->pos = pt->pos;
+    info->key_size = pt->key_size;
+    info->cmp = pt->cmp;
     info->ispt_list = NULL;
     return info;
 }
+*/
 
 RSFD r_open (RSET ct, int flag)
 {
-    struct rset_isamc_info *info = ct->buf;
+    struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv;
     struct rset_pp_info *ptinfo;
 
     logf (LOG_DEBUG, "risamc_open");
@@ -81,11 +117,12 @@ RSFD r_open (RSET ct, int flag)
 	logf (LOG_FATAL, "ISAMC 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 = isc_pp_open (info->is, info->pos);
     ptinfo->info = info;
+    ptinfo->buf = xmalloc (info->key_size);
     return ptinfo;
 }
 
@@ -97,23 +134,16 @@ static void r_close (RSFD rfd)
     for (ptinfop = &info->ispt_list; *ptinfop; ptinfop = &(*ptinfop)->next)
         if (*ptinfop == rfd)
         {
+            xfree ((*ptinfop)->buf);
             isc_pp_close ((*ptinfop)->pt);
             *ptinfop = (*ptinfop)->next;
-            free (rfd);
+            xfree (rfd);
             return;
         }
     logf (LOG_FATAL, "r_close but no rfd match!");
     assert (0);
 }
 
-static void r_delete (RSET ct)
-{
-    struct rset_isamc_info *info = ct->buf;
-
-    logf (LOG_DEBUG, "rsisamc_delete");
-    assert (info->ispt_list == NULL);
-    xfree (info);
-}
 
 static void r_rewind (RSFD rfd)
 {   
@@ -121,14 +151,12 @@ static void r_rewind (RSFD rfd)
     abort ();
 }
 
-static int r_count (RSET ct)
-{
-    return 0;
-}
-
 static int r_read (RSFD rfd, void *buf)
 {
-    return isc_pp_read( ((struct rset_pp_info*) rfd)->pt, buf);
+    struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
+    int r;
+    r = isc_pp_read(pinfo->pt, buf);
+    return r;
 }
 
 static int r_write (RSFD rfd, const void *buf)
@@ -136,9 +164,3 @@ static int r_write (RSFD rfd, const void *buf)
     logf (LOG_FATAL, "ISAMC set type is read-only");
     return -1;
 }
-
-static int r_score (RSFD rfd, int *score)
-{
-    *score = -1;
-    return -1;
-}