Charmap work

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

diff --git a/index/kcompare.c b/index/kcompare.c
index fc633e1..f38f948 100644 (file)
--- a/index/kcompare.c
+++ b/index/kcompare.c
@@ -1,10 +1,45 @@
 /*
- * 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.6  1995-09-14 07:48:23  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.
+ *
+ * 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
@@ -32,7 +67,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <assert.h>
 
 #include "index.h"
@@ -42,8 +76,7 @@ void key_logdump (int logmask, const void *p)
     struct it_key key;
 
     memcpy (&key, p, sizeof(key));
-    logf (logmask, "%7d s=%-4d f=%d,%d", key.sysno, key.seqno,
-             key.attrSet, key.attrUse);
+    logf (logmask, "%7d s=%-4d", key.sysno, key.seqno);
 }
 
 int key_compare (const void *p1, const void *p2)
@@ -75,24 +108,21 @@ int key_compare (const void *p1, const void *p2)
             return -1;
     }
 #endif
-    if (i1.attrSet != i2.attrSet)
-    {
-        if (i1.attrSet > i2.attrSet)
-            return 1;
-        else
-            return -1;
-    }
-    if (i1.attrUse != i2.attrUse)
-    {
-        if (i1.attrUse > i2.attrUse)
-            return 1;
-        else
-            return -1;
-    }
     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];
 }
+