X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=7c562960b86f1fabe4b6d22d88a54fc9b8dfe3bf;hb=ce68ef0c334af90bc25623957c1f8e72d099979b;hp=a270a891b2873430e4f48c494e2d34d7ab7953bc;hpb=ce20a8a823a2df86ace4862008684c71a4f06cd2;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index a270a89..7c56296 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.9  1995-09-14 07:48:24  adam
+ * Revision 1.12  1995-10-04 16:57:20  adam
+ * Key input and merge sort in one pass.
+ *
+ * Revision 1.11  1995/09/29  14:01:45  adam
+ * Bug fixes.
+ *
+ * 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
@@ -42,6 +51,7 @@
 #include "index.h"
 
 char *prog;
+size_t mem_max = 4*1024*1024;
 
 int main (int argc, char **argv)
 {
@@ -50,9 +60,11 @@ 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)
+    while ((ret = options ("r:v:m:", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
@@ -86,7 +98,7 @@ int main (int argc, char **argv)
             else
             {
                 unlink ("keys.tmp");
-                key_open ("keys.tmp");
+                key_open (mem_max);
                 repository (cmd, arg, base_path);
                 cmd = 0;
             }
@@ -99,6 +111,10 @@ int main (int argc, char **argv)
         {
             base_path = arg;
         }
+        else if (ret == 'm')
+        {
+            mem_max = 1024*1024*atoi(arg);
+        }
         else
         {
             logf (LOG_FATAL, "Unknown option '-%s'", arg);
@@ -111,13 +127,20 @@ int main (int argc, char **argv)
                  "base cmd1 dir1 cmd2 dir2 ...\n");
         exit (1);
     }
-    if (!key_close ())
-        exit (0);
-    logf (LOG_LOG, "Sorting");
-    if (!key_sort ("keys.tmp", 3000000))
+    nsections = key_close ();
+    if (!nsections)
         exit (0);
+#if 0
+    logf (LOG_LOG, "Merge sorting");
+    mbuf = xmalloc (100000);
+    merge_sort (mbuf, 1, nsections+1);
+    xfree (mbuf);
+    logf (LOG_LOG, "Input");
+    key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, "keys1.tmp", 60);
+#else
     logf (LOG_LOG, "Input");
-    key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, "keys.tmp", 60);
+    key_input2 (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections, 60);
+#endif
     exit (0);
 }