X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=f40cd03e4d14a35ae6500db349737e52b232f038;hb=6c836c5e8eff1e57360dd0a33197c91301277c2c;hp=5ff01a4cca97239735a42067485883be64d79eb3;hpb=e80772c51b80b8e5c9c3cfb037c988308a4014b9;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 5ff01a4..f40cd03 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,28 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.23  1995-11-30 08:34:31  adam
+ * Revision 1.28  1995-12-08 16:22:56  adam
+ * Work on update while servers are running. Three lock files introduced.
+ * The servers reload their registers when necessary, but they don't
+ * reestablish result sets yet.
+ *
+ * Revision 1.27  1995/12/07  17:38:47  adam
+ * Work locking mechanisms for concurrent updates/commit.
+ *
+ * Revision 1.26  1995/12/06  12:41:23  adam
+ * New command 'stat' for the index program.
+ * Filenames can be read from stdin by specifying '-'.
+ * Bug fix/enhancement of the transformation from terms to regular
+ * expressons in the search engine.
+ *
+ * Revision 1.25  1995/12/01  16:24:39  adam
+ * Commit files use separate meta file area.
+ *
+ * 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.
  *
@@ -102,7 +123,6 @@ int main (int argc, char **argv)
     char *arg;
     char *configName = NULL;
     int nsections;
-    int key_open_flag = 0;
 
     struct recordGroup rGroupDef;
     
@@ -131,16 +151,68 @@ int main (int argc, char **argv)
 	" -v <level>    Set logging to <level>.\n");
         exit (1);
     }
-    while ((ret = options ("t:c:g:d:m:v:l:", argv, argc, &arg)) != -2)
+    while ((ret = options ("t:c:g:d:m:v:", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
+            const char *rval;
             if(cmd == 0) /* command */
             {
+                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");
+                }
                 if (!strcmp (arg, "update"))
                     cmd = 'u';
                 else if (!strcmp (arg, "del") || !strcmp(arg, "delete"))
                     cmd = 'd';
+                else if (!strcmp (arg, "commit"))
+                {
+                    zebraIndexLock (1);
+                    rval = res_get (common_resource, "commitEnable");
+                    if (rval && atoi (rval))
+                        bf_cache (1);
+
+                    if (bf_commitExists ())
+                    {
+                        logf (LOG_LOG, "Commit start");
+                        zebraIndexLockMsg ("c");
+                        zebraIndexWait (1);
+                        logf (LOG_LOG, "Commit execute");
+                        bf_commitExec ();
+                        zebraIndexLockMsg ("d");
+                        zebraIndexWait (0);
+                        logf (LOG_LOG, "Commit clean");
+                        bf_commitClean ();
+                    }
+                    else
+                        logf (LOG_LOG, "Nothing to commit");
+                }
+                else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
+                {
+                    zebraIndexLock (0);
+                    bf_cache (0);
+                    rec_prstat ();
+                }
+                else if (!strcmp (arg, "cstat") || !strcmp (arg, "cstatus"))
+                {
+                    zebraIndexLock (1);
+                    rval = res_get (common_resource, "commitEnable");
+                    if (rval && atoi(rval))
+                    {
+                        bf_cache (1);
+                        zebraIndexLockMsg ("r");
+                    }
+                    rec_prstat ();
+                }
                 else
                 {
                     logf (LOG_FATAL, "Unknown command: %s", arg);
@@ -151,31 +223,38 @@ int main (int argc, char **argv)
             {
                 struct recordGroup rGroup;
 
-                memcpy (&rGroup, &rGroupDef, sizeof(rGroup));
-                if (!common_resource)
+                zebraIndexLock (0);
+                rval = res_get (common_resource, "commitEnable");
+                if (rval && atoi(rval))
                 {
-                    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;
+                    bf_cache (1);
+                    zebraIndexLockMsg ("r");
                 }
+                else
+                    zebraIndexLockMsg ("w");
+                zebraIndexWait (0);
+
+                memcpy (&rGroup, &rGroupDef, sizeof(rGroup));
+                key_open (mem_max);
                 rGroup.path = arg;
                 if (cmd == 'u')
+                {
+                    logf (LOG_LOG, "Updating %s", rGroup.path);
                     repositoryUpdate (&rGroup);
+                }
                 else if (cmd == 'd')
+                {
+                    logf (LOG_LOG, "Deleting %s", rGroup.path);
                     repositoryDelete (&rGroup);
+                }
                 cmd = 0;
+                nsections = key_close ();
+                if (nsections)
+                {
+                    logf (LOG_LOG, "Merging with index");
+                    key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections,
+                               60);
+                }
             }
         }
         else if (ret == 'v')
@@ -198,21 +277,13 @@ int main (int argc, char **argv)
             configName = arg;
         else if (ret == 't')
             rGroupDef.recordType = arg;
-        else if (ret == 'l')
-            bf_cache (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, "Merging with index");
-    key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections, 60);
+    zebraIndexUnlock ();
     exit (0);
 }