Charmap work

[idzebra-moved-to-github.git] / index / kcompare.c

diff --git a/index/kcompare.c b/index/kcompare.c
index 82f9343..f38f948 100644 (file)
--- a/index/kcompare.c
+++ b/index/kcompare.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1996, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kcompare.c,v $
- * Revision 1.12  1995-10-17 18:02:08  adam
+ * 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
@@ -52,7 +67,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <assert.h>
 
 #include "index.h"
@@ -67,26 +81,28 @@ void key_logdump (int logmask, const void *p)
 
 int key_compare (const void *p1, const void *p2)
 {
-    const struct it_key *i1 = p1, *i2 = p2;
-    if (i1->sysno != i2->sysno)
+    struct it_key i1, i2;
+    memcpy (&i1, p1, sizeof(i1));
+    memcpy (&i2, p2, sizeof(i2));
+    if (i1.sysno != i2.sysno)
     {
-        if (i1->sysno > i2->sysno)
+        if (i1.sysno > i2.sysno)
             return 2;
         else
             return -2;
     }
 #if IT_KEY_HAVE_SEQNO
-    if (i1->seqno != i2->seqno)
+    if (i1.seqno != i2.seqno)
     {
-        if (i1->seqno > i2->seqno)
+        if (i1.seqno > i2.seqno)
             return 1;
         else
             return -1;
     }
 #else
-    if (i1->freq != i2->freq)
+    if (i1.freq != i2.freq)
     {
-        if (i1->freq > i2->freq)
+        if (i1.freq > i2.freq)
             return 1;
         else
             return -1;
@@ -110,33 +126,3 @@ int key_qsort_compare (const void *p1, const void *p2)
     return cp1[l] - cp2[l];
 }
 
-int index_char_cvt (int c)
-{
-    return tolower (c);
-}
-
-int index_word_prefix (char *string, int attset_ordinal,
-                       int local_attribute,
-                       int num_bases,
-                       char **databaseNames)
-{
-    int i;
-    if (num_bases > 1)
-    {
-        sprintf (string, "%c%04d(", attset_ordinal + '0', local_attribute);
-        strcat (string, databaseNames[i]);
-        for (i = 1; i < num_bases; i++)
-        {
-            strcat (string, "|");
-            strcat (string, databaseNames[i]);
-        }
-        strcat (string, ")@");
-    }
-    else
-        sprintf (string, "%c%04d%s@", attset_ordinal + '0', local_attribute,
-                 *databaseNames);
-    for (i = 0; string[i]; i++)
-        string[i] = index_char_cvt (string[i]);
-    return i;
-}
-