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

diff --git a/index/main.c b/index/main.c
index 916f248..7c56296 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.11  1995-09-29 14:01:45  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
@@ -127,12 +130,17 @@ int main (int argc, char **argv)
     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_input2 (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections, 60);
+#endif
     exit (0);
 }