X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=a270a891b2873430e4f48c494e2d34d7ab7953bc;hb=4f4057606fcc67b92895e575a6f3af2d5165b75c;hp=7127c84e811f64b3c9fc99b4af21d80da85639e7;hpb=51a52e1b014d5237581f74379916b8ce92cafef7;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 7127c84..a270a89 100644
--- a/index/main.c
+++ b/index/main.c
@@ -1,10 +1,27 @@
 /*
- * 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.4  1995-09-01 14:06:36  adam
+ * 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
+ * More work on index add/del/update.
+ * Merge sort implemented.
+ * Initial work on z39 server.
+ *
+ * Revision 1.4  1995/09/01  14:06:36  adam
  * Split of work into more files.
  *
  * Revision 1.3  1995/09/01  10:57:07  adam
@@ -21,7 +38,7 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include <util.h>
+#include <alexutil.h>
 #include "index.h"
 
 char *prog;
@@ -46,7 +63,7 @@ int main (int argc, char **argv)
                 common_resource = res_open (base_name);
                 if (!common_resource)
                 {
-                    log (LOG_FATAL, "Cannot open resource `%s'", base_name);
+                    logf (LOG_FATAL, "Cannot open resource `%s'", base_name);
                     exit (1);
                 }
             }
@@ -62,12 +79,13 @@ int main (int argc, char **argv)
                 }
                 else
                 {
-                    log (LOG_FATAL, "Unknown command: %s", arg);
+                    logf (LOG_FATAL, "Unknown command: %s", arg);
                     exit (1);
                 }
             }
             else
             {
+                unlink ("keys.tmp");
                 key_open ("keys.tmp");
                 repository (cmd, arg, base_path);
                 cmd = 0;
@@ -83,7 +101,7 @@ int main (int argc, char **argv)
         }
         else
         {
-            log (LOG_FATAL, "Unknown option '-%s'", arg);
+            logf (LOG_FATAL, "Unknown option '-%s'", arg);
             exit (1);
         }
     }
@@ -93,7 +111,13 @@ int main (int argc, char **argv)
                  "base cmd1 dir1 cmd2 dir2 ...\n");
         exit (1);
     }
-    key_flush ();
-    key_close ();
+    if (!key_close ())
+        exit (0);
+    logf (LOG_LOG, "Sorting");
+    if (!key_sort ("keys.tmp", 3000000))
+        exit (0);
+    logf (LOG_LOG, "Input");
+    key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, "keys.tmp", 60);
     exit (0);
 }
+