X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkcompare.c;h=f38f9486052e9755e4730ed291cecb50b43fe8be;hb=b8844c65622c12fb105bf7fc6bab2fc237af7c14;hp=d326493b521ff2fa1136b7bf9b234bdff4b36b11;hpb=ca19a15163ee74ee0c6765bfef4fd9794627e26a;p=idzebra-moved-to-github.git

diff --git a/index/kcompare.c b/index/kcompare.c
index d326493..f38f948 100644
--- a/index/kcompare.c
+++ b/index/kcompare.c
@@ -1,10 +1,37 @@
 /*
- * 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.8  1995-09-28 09:19:42  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
+ * 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.
  *
@@ -40,7 +67,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <assert.h>
 
 #include "index.h"
@@ -55,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;
@@ -83,7 +111,18 @@ int key_compare (const void *p1, const void *p2)
     return 0;
 }
 
-int index_char_cvt (int c)
+int key_qsort_compare (const void *p1, const void *p2)
 {
-    return tolower (c);
+    int r;
+    size_t l;
+    char *cp1 = *(char **) p1;
+    char *cp2 = *(char **) p2;
+ 
+    if ((r = strcmp (cp1, cp2)))
+        return r;
+    l = strlen(cp1)+1;
+    if ((r = key_compare (cp1+l+1, cp2+l+1)))
+        return r;
+    return cp1[l] - cp2[l];
 }
+