Sort uses smaller temporary files.

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

diff --git a/index/main.c b/index/main.c
index 753ee50..0616499 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1995, Index Data I/S 
+ * Copyright (C) 1994-1995, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.6  1995-09-04 12:33:43  adam
+ * Revision 1.10  1995-09-28 14:22:57  adam
+ * Sort uses smaller temporary files.
+ *
+ * Revision 1.9  1995/09/14  07:48:24  adam
+ * Record control management.
+ *
+ * Revision 1.8  1995/09/06  16:11:18  adam
+ * Option: only one word key per file.
+ *
+ * Revision 1.7  1995/09/05  15:28:39  adam
+ * More work on search engine.
+ *
+ * Revision 1.6  1995/09/04  12:33:43  adam
  * Various cleanup. YAZ util used instead.
  *
  * Revision 1.5  1995/09/04  09:10:39  adam
@@ -41,6 +53,8 @@ int main (int argc, char **argv)
     char *arg;
     char *base_name = NULL;
     char *base_path = NULL;
+    int nsections;
+    char **mbuf;
 
     prog = *argv;
     while ((ret = options ("r:v:", argv, argc, &arg)) != -2)
@@ -77,7 +91,7 @@ int main (int argc, char **argv)
             else
             {
                 unlink ("keys.tmp");
-                key_open ("keys.tmp");
+                key_open (3000000);
                 repository (cmd, arg, base_path);
                 cmd = 0;
             }
@@ -102,13 +116,14 @@ int main (int argc, char **argv)
                  "base cmd1 dir1 cmd2 dir2 ...\n");
         exit (1);
     }
-    key_flush ();
-    if (!key_close ())
-        exit (0);
-    logf (LOG_DEBUG, "Sorting");
-    if (!key_sort ("keys.tmp", 1000000))
+    nsections = key_close ();
+    if (!nsections)
         exit (0);
-    logf (LOG_DEBUG, "Input");
-    key_input ("dictinv", "isaminv", "keys.tmp", 50);
+    logf (LOG_LOG, "Merge sorting");
+    mbuf = xmalloc (100000);
+    merge_sort (mbuf, 1, nsections+1);
+    logf (LOG_LOG, "Input");
+    key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, "keys1.tmp", 60);
     exit (0);
 }
+