X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=08ced197ec52644a55904cc8e85c095b397cf9ff;hb=ce68ef0c334af90bc25623957c1f8e72d099979b;hp=2ebdb616029d0ae67e10cbfeeb323933d0d6acae;hpb=aebdede4bcc1dfe05728dac36b51a1cda85cc70e;p=idzebra-moved-to-github.git

diff --git a/index/index.h b/index/index.h
index 2ebdb61..08ced19 100644
--- a/index/index.h
+++ b/index/index.h
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: index.h,v $
- * Revision 1.11  1995-09-27 12:22:28  adam
+ * Revision 1.15  1995-10-04 16:57:19  adam
+ * Key input and merge sort in one pass.
+ *
+ * Revision 1.14  1995/09/29  14:01:40  adam
+ * Bug fixes.
+ *
+ * Revision 1.13  1995/09/28  14:22:56  adam
+ * Sort uses smaller temporary files.
+ *
+ * Revision 1.12  1995/09/28  12:10:32  adam
+ * Bug fixes. Field prefix used in queries.
+ *
+ * Revision 1.11  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.
  *
@@ -51,8 +63,8 @@
 #define IT_KEY_HAVE_FIELD 0
 
 struct it_key {
-    int   sysno;
-    short seqno;
+    int   sysno : 24;
+    int   seqno : 16;
 };
 
 struct dir_entry {
@@ -66,15 +78,19 @@ void repository (int cmd, const char *rep, const char *base_path);
 
 void file_extract (int cmd, const char *fname, const char *kname);
 
-void key_open (const char *fname);
+void key_open (int mem);
 int key_close (void);
 void key_write (int cmd, struct it_key *k, const char *str);
 int key_compare (const void *p1, const void *p2);
+int key_qsort_compare (const void *p1, const void *p2);
 void key_logdump (int mask, const void *p);
 void key_input (const char *dict_fname, const char *isam_fname, 
                 const char *key_fname, int cache);
-int key_sort (const char *key_fname, size_t mem);
+void key_input2 (const char *dict_fname, const char *isam_fname,
+                 int nkeys, int cache);
+int merge_sort (char **buf, int from, int to);
 
+#define TEMP_FNAME  "keys%d.tmp"
 #define FNAME_WORD_DICT "worddict"
 #define FNAME_WORD_ISAM "wordisam"
 #define FNAME_FILE_DICT "filedict"
@@ -87,3 +103,4 @@ void strtab_del (struct strtab *t,
                  void (*func)(const char *name, void *info, void *data),
                  void *data);
 int index_char_cvt (int c);
+int index_word_prefix (char *string, int attrSet, int attrUse);