Various cleanup. YAZ util used instead.

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

diff --git a/index/main.c b/index/main.c
index 7127c84..753ee50 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,15 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.4  1995-09-01 14:06:36  adam
+ * 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 +29,7 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include <util.h>
+#include <alexutil.h>
 #include "index.h"
 
 char *prog;
@@ -46,7 +54,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 +70,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 +92,7 @@ int main (int argc, char **argv)
         }
         else
         {
-            log (LOG_FATAL, "Unknown option '-%s'", arg);
+            logf (LOG_FATAL, "Unknown option '-%s'", arg);
             exit (1);
         }
     }
@@ -94,6 +103,12 @@ int main (int argc, char **argv)
         exit (1);
     }
     key_flush ();
-    key_close ();
+    if (!key_close ())
+        exit (0);
+    logf (LOG_DEBUG, "Sorting");
+    if (!key_sort ("keys.tmp", 1000000))
+        exit (0);
+    logf (LOG_DEBUG, "Input");
+    key_input ("dictinv", "isaminv", "keys.tmp", 50);
     exit (0);
 }