Work on new traversal.

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

diff --git a/index/main.c b/index/main.c
index 7c56296..92ea245 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.12  1995-10-04 16:57:20  adam
+ * Revision 1.16  1995-11-20 11:56:27  adam
+ * Work on new traversal.
+ *
+ * Revision 1.15  1995/11/01  16:25:51  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.14  1995/10/17  18:02:09  adam
+ * New feature: databases. Implemented as prefix to words in dictionary.
+ *
+ * Revision 1.13  1995/10/10  12:24:39  adam
+ * Temporary sort files are compressed.
+ *
+ * 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
@@ -48,6 +60,7 @@
 #include <unistd.h>
 
 #include <alexutil.h>
+#include <data1.h>
 #include "index.h"
 
 char *prog;
@@ -60,11 +73,12 @@ int main (int argc, char **argv)
     char *arg;
     char *base_name = NULL;
     char *base_path = NULL;
+    char *databaseName = "Default";
     int nsections;
-    char **mbuf;
+    int key_open_flag = 0;
 
     prog = *argv;
-    while ((ret = options ("r:v:m:", argv, argc, &arg)) != -2)
+    while ((ret = options ("r:v:m:d:", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
@@ -78,6 +92,7 @@ int main (int argc, char **argv)
                     logf (LOG_FATAL, "Cannot open resource `%s'", base_name);
                     exit (1);
                 }
+               data1_tabpath = res_get(common_resource, "data1_tabpath");
             }
             else if(cmd == 0) /* command */
             {
@@ -97,9 +112,16 @@ int main (int argc, char **argv)
             }
             else
             {
-                unlink ("keys.tmp");
-                key_open (mem_max);
-                repository (cmd, arg, base_path);
+                if (!key_open_flag)
+                {
+                    key_open (mem_max);
+                    key_open_flag = 1;
+                }
+#if 0
+                repository (cmd, arg, base_path, databaseName);
+#else
+                repositoryUpdate (arg, databaseName);
+#endif
                 cmd = 0;
             }
         }
@@ -115,6 +137,10 @@ int main (int argc, char **argv)
         {
             mem_max = 1024*1024*atoi(arg);
         }
+        else if (ret == 'd')
+        {
+            databaseName = arg;
+        }
         else
         {
             logf (LOG_FATAL, "Unknown option '-%s'", arg);
@@ -123,24 +149,17 @@ int main (int argc, char **argv)
     }
     if (!base_name)
     {
-        fprintf (stderr, "index [-v log] [-r repository] "
-                 "base cmd1 dir1 cmd2 dir2 ...\n");
+        fprintf (stderr, "index [-v log] [-r repository] [-m meg] [-d base]"
+                 " base cmd1 dir1 cmd2 dir2 ...\n");
         exit (1);
     }
+    if (!key_open_flag)
+        exit (0);
     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
+    key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections, 60);
     exit (0);
 }