X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkcompare.c;h=ab14f79a85f461c3b1f0464d44bb3ed3baf9dfab;hb=dbd6f3a01791401472b07250bf35dcbc3ead4f92;hp=ca513ab5fd8e9f36cd891d069925723bdcc04dd8;hpb=b0728a451f81973f750f6a806b566d506a17dbe9;p=idzebra-moved-to-github.git

diff --git a/index/kcompare.c b/index/kcompare.c
index ca513ab..ab14f79 100644
--- a/index/kcompare.c
+++ b/index/kcompare.c
@@ -1,85 +1,27 @@
-/*
- * Copyright (C) 1994-1997, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: kcompare.c,v $
- * Revision 1.22  1997-09-22 12:39:06  adam
- * Added get_pos method for the ranked result sets.
- *
- * Revision 1.21  1997/09/17 12:19:13  adam
- * Zebra version corresponds to YAZ version 1.4.
- * Changed Zebra server so that it doesn't depend on global common_resource.
- *
- * Revision 1.20  1996/12/23 15:30:44  adam
- * Work on truncation.
- * Bug fix: result sets weren't deleted after server shut down.
- *
- * Revision 1.19  1996/12/11 12:08:00  adam
- * Added better compression.
- *
- * Revision 1.18  1996/10/29 14:09:44  adam
- * Use of cisam system - enabled if setting isamc is 1.
- *
- * Revision 1.17  1996/06/04 10:18:58  adam
- * Minor changes - removed include of ctype.h.
- *
- * Revision 1.16  1996/05/13  14:23:05  adam
- * Work on compaction of set/use bytes in dictionary.
- *
- * Revision 1.15  1995/11/20  16:59:46  adam
- * New update method: the 'old' keys are saved for each records.
- *
- * Revision 1.14  1995/10/30  15:08:08  adam
- * Bug fixes.
- *
- * Revision 1.13  1995/10/27  14:00:11  adam
- * Implemented detection of database availability.
- *
- * Revision 1.12  1995/10/17  18:02:08  adam
- * New feature: databases. Implemented as prefix to words in dictionary.
- *
- * Revision 1.11  1995/10/06  16:33:37  adam
- * Use attribute mappings.
- *
- * Revision 1.10  1995/09/29  14:01:41  adam
- * Bug fixes.
- *
- * Revision 1.9  1995/09/28  12:10:32  adam
- * Bug fixes. Field prefix used in queries.
- *
- * Revision 1.8  1995/09/28  09:19:42  adam
- * xfree/xmalloc used everywhere.
- * Extract/retrieve method seems to work for text records.
- *
- * Revision 1.7  1995/09/27  12:22:28  adam
- * More work on extract in record control.
- * Field name is not in isam keys but in prefix in dictionary words.
- *
- * Revision 1.6  1995/09/14  07:48:23  adam
- * Record control management.
- *
- * Revision 1.5  1995/09/11  13:09:34  adam
- * More work on relevance feedback.
- *
- * Revision 1.4  1995/09/08  14:52:27  adam
- * Minor changes. Dictionary is lower case now.
- *
- * Revision 1.3  1995/09/07  13:58:36  adam
- * New parameter: result-set file descriptor (RSFD) to support multiple
- * positions within the same result-set.
- * Boolean operators: and, or, not implemented.
- * Result-set references.
- *
- * Revision 1.2  1995/09/06  16:11:17  adam
- * Option: only one word key per file.
- *
- * Revision 1.1  1995/09/04  09:10:36  adam
- * More work on index add/del/update.
- * Merge sort implemented.
- * Initial work on z39 server.
- *
- */
+/* $Id: kcompare.c,v 1.41 2003-06-23 15:35:25 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+   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 <stdlib.h>
 #include <string.h>
@@ -115,6 +57,13 @@ int key_compare_it (const void *p1, const void *p2)
     return 0;
 }
 
+char *key_print_it (const void *p, char *buf)
+{
+    const struct it_key *i = p;
+    sprintf (buf, "%d:%d", i->sysno, i->seqno);
+    return buf;
+}
+
 int key_compare (const void *p1, const void *p2)
 {
     struct it_key i1, i2;
@@ -165,12 +114,20 @@ struct iscz1_code_info {
 
 static void *iscz1_code_start (int mode)
 {
-    struct iscz1_code_info *p = xmalloc (sizeof(*p));
+    struct iscz1_code_info *p = (struct iscz1_code_info *)
+	xmalloc (sizeof(*p));
     p->key.sysno = 0;
     p->key.seqno = 0;
     return p;
 }
 
+static void iscz1_code_reset (void *vp)
+{
+    struct iscz1_code_info *p = (struct iscz1_code_info *) vp;
+    p->key.sysno = 0;
+    p->key.seqno = 0;
+}
+
 static void iscz1_code_stop (int mode, void *p)
 {
     xfree (p);
@@ -184,18 +141,18 @@ void iscz1_encode_int (unsigned d, char **dst)
         *bp++ = d;
     else if (d <= 16383)
     {
-        *bp++ = 64 + (d>>8);
+        *bp++ = 64 | (d>>8);
        *bp++ = d & 255;
     }
     else if (d <= 4194303)
     {
-        *bp++ = 128 + (d>>16);
+        *bp++ = 128 | (d>>16);
         *bp++ = (d>>8) & 255;
         *bp++ = d & 255;
     }
     else
     {
-        *bp++ = 192 + (d>>24);
+        *bp++ = 192 | (d>>24);
         *bp++ = (d>>16) & 255;
         *bp++ = (d>>8) & 255;
         *bp++ = d & 255;
@@ -217,15 +174,19 @@ int iscz1_decode_int (unsigned char **src)
         c = (c << 8) + *(*src)++;
         return c;
     }
-    c = ((c & 63) << 8) + *(*src)++;
+    if (c&32) /* expand sign bit to high bits */
+       c = ((c | 63) << 8) + *(*src)++;
+    else
+       c = ((c & 63) << 8) + *(*src)++;
     c = (c << 8) + *(*src)++;
     c = (c << 8) + *(*src)++;
+    
     return c;
 }
 
 static void iscz1_code_item (int mode, void *vp, char **dst, char **src)
 {
-    struct iscz1_code_info *p = vp;
+    struct iscz1_code_info *p = (struct iscz1_code_info *) vp;
     struct it_key tkey;
     int d;
 
@@ -262,24 +223,89 @@ static void iscz1_code_item (int mode, void *vp, char **dst, char **src)
     }
 }
 
-ISAMC_M key_isamc_m (Res res)
+ISAMS_M *key_isams_m (Res res, ISAMS_M *me)
 {
-    static ISAMC_M me = NULL;
+    isams_getmethod (me);
+
+    me->compare_item = key_compare;
 
-    if (me)
-        return me;
+    me->code_start = iscz1_code_start;
+    me->code_item = iscz1_code_item;
+    me->code_stop = iscz1_code_stop;
+
+    me->debug = atoi(res_get_def (res, "isamsDebug", "0"));
+
+    return me;
+}
 
-    me = isc_getmethod ();
+ISAMC_M *key_isamc_m (Res res, ISAMC_M *me)
+{
+    isc_getmethod (me);
 
     me->compare_item = key_compare;
 
     me->code_start = iscz1_code_start;
     me->code_item = iscz1_code_item;
     me->code_stop = iscz1_code_stop;
+    me->code_reset = iscz1_code_reset;
 
     me->debug = atoi(res_get_def (res, "isamcDebug", "0"));
 
-    logf (LOG_LOG, "ISAMC system active");
     return me;
 }
 
+ISAMD_M *key_isamd_m (Res res, ISAMD_M *me)
+{
+    me = isamd_getmethod (me);
+
+    me->compare_item = key_compare;
+
+    me->code_start = iscz1_code_start;
+    me->code_item = iscz1_code_item;
+    me->code_stop = iscz1_code_stop;
+    me->code_reset = iscz1_code_reset;
+
+    me->debug = atoi(res_get_def (res, "isamdDebug", "0"));
+
+    return me;
+}
+
+int key_SU_encode (int ch, char *out)
+{
+    int i;
+    for (i = 0; ch; i++)
+    {
+	if (ch >= 64)
+	    out[i] = 65 + (ch & 63);
+	else
+	    out[i] = 1 + ch;
+	ch = ch >> 6;
+    }
+    return i;
+    /* in   out
+       0     1
+       1     2
+       63    64
+       64    65, 2
+       65    66, 2
+       127   128, 2
+       128   65, 3
+       191   128, 3
+       192   65, 4
+    */
+}
+
+int key_SU_decode (int *ch, const unsigned char *out)
+{
+    int len = 1;
+    int fact = 1;
+    *ch = 0;
+    for (len = 1; *out >= 65; len++, out++)
+    {
+	*ch += (*out - 65) * fact;
+	fact <<= 6;
+    }
+    *ch += (*out - 1) * fact;
+    return len;
+}
+