New setting commitCache: points to commit directories/files.

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

diff --git a/index/main.c b/index/main.c
index 41a9579..c81c149 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,25 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.20  1995-11-27 13:58:53  adam
+ * Revision 1.24  1995-11-30 17:01:38  adam
+ * New setting commitCache: points to commit directories/files.
+ * New command commit: commits at the end of a zebraidx run.
+ *
+ * Revision 1.23  1995/11/30  08:34:31  adam
+ * Started work on commit facility.
+ * Changed a few malloc/free to xmalloc/xfree.
+ *
+ * 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
@@ -83,6 +101,7 @@ extern char *data1_tabpath;
 
 int main (int argc, char **argv)
 {
+    int commit_at_end = 0;
     int ret;
     int cmd = 0;
     char *arg;
@@ -90,41 +109,58 @@ int main (int argc, char **argv)
     int nsections;
     int key_open_flag = 0;
 
-    struct recordGroup rGroup;
+    struct recordGroup rGroupDef;
     
-    rGroup.groupName = NULL;
-    rGroup.databaseName = NULL;
-    rGroup.path = NULL;
-    rGroup.fileMatch = NULL;
-    rGroup.flagStoreData = -1;
-    rGroup.flagStoreKeys = -1;
-    rGroup.fileType = NULL;
+    rGroupDef.groupName = NULL;
+    rGroupDef.databaseName = NULL;
+    rGroupDef.path = NULL;
+    rGroupDef.recordId = NULL;
+    rGroupDef.recordType = NULL;
+    rGroupDef.flagStoreData = -1;
+    rGroupDef.flagStoreKeys = -1;
 
     prog = *argv;
     if (argc < 2)
     {
-        fprintf (stderr, "index [-v log] [-m meg] [-c config] [-d base]"
-                 " [-g group] cmd1 dir1 cmd2 dir2 ...\n");
+        fprintf (stderr, "zebraidx [options] command <dir> ...\n"
+        "Commands:\n"
+        " update <dir>  Update index with files below <dir>.\n"
+       "               If <dir> is empty filenames are read from stdin.\n"
+        " delete <dir>  Delete index with files below <dir>.\n"
+        "Options:\n"
+       " -t <type>     Index files as <type> (grs or text).\n"
+       " -c <config>   Read configuration file <config>.\n"
+       " -g <group>    Index files according to group settings.\n"
+       " -d <database> Records belong to Z39.50 database <database>.\n"
+       " -m <mbytes>   Use <mbytes> before flushing keys to disk.\n"
+       " -v <level>    Set logging to <level>.\n");
         exit (1);
     }
-    while ((ret = options ("t:c:g:v:m:d:", argv, argc, &arg)) != -2)
+    while ((ret = options ("t:c:g:d:m:v:", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
             if(cmd == 0) /* command */
             {
-                if (!strcmp (arg, "add"))
-                {
-                    cmd = 'a';
-                }
-                else if (!strcmp (arg, "del"))
+                if (!common_resource)
                 {
-                    cmd = 'd';
+                    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");
+                    bf_cache (res_get (common_resource, "commitCache"));
                 }
-                else if (!strcmp (arg, "update"))
-                {
+                if (!strcmp (arg, "update"))
                     cmd = 'u';
-                }
+                else if (!strcmp (arg, "del") || !strcmp(arg, "delete"))
+                    cmd = 'd';
+                else if (!strcmp (arg, "commit"))
+                    commit_at_end = 1;
                 else
                 {
                     logf (LOG_FATAL, "Unknown command: %s", arg);
@@ -133,19 +169,9 @@ int main (int argc, char **argv)
             }
             else
             {
-                if (!common_resource)
-                {
-                    common_resource = res_open (configName ?
-                                                configName : "base");
-                    if (!common_resource)
-                    {
-                        logf (LOG_FATAL, "Cannot open resource `%s'",
-                              configName);
-                        exit (1);
-                    }
-                    data1_tabpath = res_get (common_resource, "data1_tabpath");
-                    assert (data1_tabpath);
-                }
+                struct recordGroup rGroup;
+
+                memcpy (&rGroup, &rGroupDef, sizeof(rGroup));
                 if (!key_open_flag)
                 {
                     key_open (mem_max);
@@ -154,8 +180,6 @@ int main (int argc, char **argv)
                 rGroup.path = arg;
                 if (cmd == 'u')
                     repositoryUpdate (&rGroup);
-                else if (cmd == 'a')
-                    repositoryAdd (&rGroup);
                 else if (cmd == 'd')
                     repositoryDelete (&rGroup);
                 cmd = 0;
@@ -171,29 +195,36 @@ int main (int argc, char **argv)
         }
         else if (ret == 'd')
         {
-            rGroup.databaseName = arg;
+            rGroupDef.databaseName = arg;
         }
         else if (ret == 'g')
         {
-            rGroup.groupName = arg;
+            rGroupDef.groupName = arg;
         }
         else if (ret == 'c')
             configName = arg;
         else if (ret == 't')
-            rGroup.fileType = arg;
+            rGroupDef.recordType = arg;
         else
         {
             logf (LOG_FATAL, "Unknown option '-%s'", arg);
             exit (1);
         }
     }
-    if (!key_open_flag)
-        exit (0);
-    nsections = key_close ();
-    if (!nsections)
-        exit (0);
-    logf (LOG_LOG, "Input");
-    key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections, 60);
+    if (key_open_flag)
+    {
+        nsections = key_close ();
+        if (nsections)
+        {
+            logf (LOG_LOG, "Merging with index");
+            key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections, 60);
+        }
+    }
+    if (commit_at_end)
+    {
+        logf (LOG_LOG, "commiting");
+        bf_commit (res_get (common_resource, "commitCache"));
+    }
     exit (0);
 }