X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=140ef986b99847cf1c3d7950ff7a504eb787704e;hb=d1eb772bc9be731951f571a0ba2040e59ce80598;hp=06164991df43c7e1169d5d9a20437045b1e04ff2;hpb=3003d747565b03bac252b43eca48bb691d1adbfc;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 0616499..140ef98 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,49 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.10  1995-09-28 14:22:57  adam
+ * Revision 1.22  1995-11-28 09:09:42  adam
+ * Zebra config renamed.
+ * Use setting 'recordId' to identify record now.
+ * Bug fix in recindex.c: rec_release_blocks was invokeded even
+ * though the blocks were already released.
+ * File traversal properly deletes records when needed.
+ *
+ * Revision 1.21  1995/11/27  14:27:39  adam
+ * Renamed 'update' command to 'dir'.
+ *
+ * Revision 1.20  1995/11/27  13:58:53  adam
+ * New option -t. storeStore data implemented in server.
+ *
+ * Revision 1.19  1995/11/25  10:24:06  adam
+ * More record fields - they are enumerated now.
+ * New options: flagStoreData flagStoreKey.
+ *
+ * Revision 1.18  1995/11/22  17:19:17  adam
+ * Record management uses the bfile system.
+ *
+ * Revision 1.17  1995/11/21  15:01:16  adam
+ * New general match criteria implemented.
+ * New feature: document groups.
+ *
+ * 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
+ * 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
@@ -42,46 +84,49 @@
 #include <unistd.h>
 
 #include <alexutil.h>
+#include <data1.h>
 #include "index.h"
 
 char *prog;
+size_t mem_max = 4*1024*1024;
+extern char *data1_tabpath;
 
 int main (int argc, char **argv)
 {
     int ret;
     int cmd = 0;
     char *arg;
-    char *base_name = NULL;
-    char *base_path = NULL;
+    char *configName = NULL;
     int nsections;
-    char **mbuf;
+    int key_open_flag = 0;
+
+    struct recordGroup rGroupDef;
+    
+    rGroupDef.groupName = NULL;
+    rGroupDef.databaseName = NULL;
+    rGroupDef.path = NULL;
+    rGroupDef.recordId = NULL;
+    rGroupDef.recordType = NULL;
+    rGroupDef.flagStoreData = -1;
+    rGroupDef.flagStoreKeys = -1;
 
     prog = *argv;
-    while ((ret = options ("r:v:", argv, argc, &arg)) != -2)
+    if (argc < 2)
+    {
+        fprintf (stderr, "index [-v log] [-m meg] [-c config] [-d base]"
+                 " [-g group] [update|del dir] ...\n");
+        exit (1);
+    }
+    while ((ret = options ("t:c:g:v:m:d:", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
-            if (!base_name)
+            if(cmd == 0) /* command */
             {
-                base_name = arg;
-
-                common_resource = res_open (base_name);
-                if (!common_resource)
-                {
-                    logf (LOG_FATAL, "Cannot open resource `%s'", base_name);
-                    exit (1);
-                }
-            }
-            else if(cmd == 0) /* command */
-            {
-                if (!strcmp (arg, "add"))
-                {
-                    cmd = 'a';
-                }
-                else if (!strcmp (arg, "del"))
-                {
+                if (!strcmp (arg, "update"))
+                    cmd = 'u';
+                else if (!strcmp (arg, "del") || !strcmp(arg, "delete"))
                     cmd = 'd';
-                }
                 else
                 {
                     logf (LOG_FATAL, "Unknown command: %s", arg);
@@ -90,9 +135,32 @@ int main (int argc, char **argv)
             }
             else
             {
-                unlink ("keys.tmp");
-                key_open (3000000);
-                repository (cmd, arg, base_path);
+                struct recordGroup rGroup;
+
+                memcpy (&rGroup, &rGroupDef, sizeof(rGroup));
+                if (!common_resource)
+                {
+                    common_resource = res_open (configName ?
+                                                configName : FNAME_CONFIG);
+                    if (!common_resource)
+                    {
+                        logf (LOG_FATAL, "Cannot open resource `%s'",
+                              configName);
+                        exit (1);
+                    }
+                    data1_tabpath = res_get (common_resource, "profilePath");
+                    assert (data1_tabpath);
+                }
+                if (!key_open_flag)
+                {
+                    key_open (mem_max);
+                    key_open_flag = 1;
+                }
+                rGroup.path = arg;
+                if (cmd == 'u')
+                    repositoryUpdate (&rGroup);
+                else if (cmd == 'd')
+                    repositoryDelete (&rGroup);
                 cmd = 0;
             }
         }
@@ -100,30 +168,35 @@ int main (int argc, char **argv)
         {
             log_init (log_mask_str(arg), prog, NULL);
         }
-        else if (ret == 'r')
+        else if (ret == 'm')
+        {
+            mem_max = 1024*1024*atoi(arg);
+        }
+        else if (ret == 'd')
+        {
+            rGroupDef.databaseName = arg;
+        }
+        else if (ret == 'g')
         {
-            base_path = arg;
+            rGroupDef.groupName = arg;
         }
+        else if (ret == 'c')
+            configName = arg;
+        else if (ret == 't')
+            rGroupDef.recordType = arg;
         else
         {
             logf (LOG_FATAL, "Unknown option '-%s'", arg);
             exit (1);
         }
     }
-    if (!base_name)
-    {
-        fprintf (stderr, "index [-v log] [-r repository] "
-                 "base cmd1 dir1 cmd2 dir2 ...\n");
-        exit (1);
-    }
+    if (!key_open_flag)
+        exit (0);
     nsections = key_close ();
     if (!nsections)
         exit (0);
-    logf (LOG_LOG, "Merge sorting");
-    mbuf = xmalloc (100000);
-    merge_sort (mbuf, 1, nsections+1);
-    logf (LOG_LOG, "Input");
-    key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, "keys1.tmp", 60);
+    logf (LOG_LOG, "Merging with index");
+    key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections, 60);
     exit (0);
 }