X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=06164991df43c7e1169d5d9a20437045b1e04ff2;hb=3003d747565b03bac252b43eca48bb691d1adbfc;hp=f8e136257f95577795a636d9aa6334603bef29f8;hpb=caa7fe057dd8617129577a6725d2c4e3da066857;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index f8e1362..0616499 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.8  1995-09-06 16:11:18  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
@@ -47,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)
@@ -83,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;
             }
@@ -108,14 +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_LOG, "Sorting");
-    if (!key_sort ("keys.tmp", 3000000))
+    nsections = key_close ();
+    if (!nsections)
         exit (0);
+    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, "keys.tmp", 60);
+    key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, "keys1.tmp", 60);
     exit (0);
 }