Towards GPL

[idzebra-moved-to-github.git] / rset / rsisamd.c

diff --git a/rset/rsisamd.c b/rset/rsisamd.c
index 3aceccb..b655b94 100644 (file)
--- a/rset/rsisamd.c
+++ b/rset/rsisamd.c
@@ -1,20 +1,31 @@
-/*
- * Copyright (C) 1994-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rsisamd.c,v $
- * Revision 1.1  2001-01-16 19:17:18  heikki
- * Added rsisamd.c
- *
- *
- */
+/* $Id: rsisamd.c,v 1.4 2002-08-02 19:26:57 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 <stdio.h>
 #include <assert.h>
 #include <zebrautl.h>
-#if ZMBOL
 #include <rsisamd.h>
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
@@ -48,8 +59,10 @@ struct rset_pp_info {
 };
 
 struct rset_isamd_info {
-    ISAMD   is;
-    ISAMD_P pos;
+    ISAMD   is; 
+    /* ISAMD_P pos; */
+    char dictentry[ISAMD_MAX_DICT_LEN];
+    int dictlen;
     struct rset_pp_info *ispt_list;
 };
 
@@ -61,7 +74,9 @@ static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
     ct->flags |= RSET_FLAG_VOLATILE;
     info = (struct rset_isamd_info *) xmalloc (sizeof(*info));
     info->is = pt->is;
-    info->pos = pt->pos;
+    /*info->pos = pt->pos;*/
+    info->dictlen = pt->dictlen;
+    memcpy(info->dictentry, pt->dictentry, pt->dictlen);
     info->ispt_list = NULL;
     ct->no_rset_terms = 1;
     ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
@@ -83,7 +98,7 @@ RSFD r_open (RSET ct, int flag)
     ptinfo = (struct rset_pp_info *) xmalloc (sizeof(*ptinfo));
     ptinfo->next = info->ispt_list;
     info->ispt_list = ptinfo;
-    ptinfo->pt = isamd_pp_open (info->is, info->pos);
+    ptinfo->pt = isamd_pp_open (info->is, info->dictentry, info->dictlen);
     ptinfo->info = info;
     if (ct->rset_terms[0]->nn < 0)
        ct->rset_terms[0]->nn = isamd_pp_num (ptinfo->pt);
@@ -140,4 +155,3 @@ static int r_write (RSFD rfd, const void *buf)
     logf (LOG_FATAL, "ISAMD set type is read-only");
     return -1;
 }
-#endif