X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=553e280e83d4a56e99e8ec8ea41aeda9211107ad;hb=85df66537199c30a492ad54be4fbe25fa77e18c8;hp=5375e097fdeb392785a8a4c3227657e1f270a09d;hpb=4e2fc80e64f3d7895a871ea5b08aa80045a59f2c;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 5375e09..553e280 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.27  1995-12-07 17:38:47  adam
+ * Revision 1.30  1995-12-12 16:00:59  adam
+ * System call sync(2) used after update/commit.
+ * Locking (based on fcntl) uses F_EXLCK and F_SHLCK instead of F_WRLCK
+ * and F_RDLCK.
+ *
+ * Revision 1.29  1995/12/11  11:43:30  adam
+ * Locking based on fcntl instead of flock.
+ * Setting commitEnable removed. Command line option -n can be used to
+ * prevent commit if commit setting is defined in the configuration file.
+ *
+ * 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
@@ -118,6 +133,7 @@ int main (int argc, char **argv)
     char *arg;
     char *configName = NULL;
     int nsections;
+    int disableCommit = 0;
 
     struct recordGroup rGroupDef;
     
@@ -137,24 +153,26 @@ int main (int argc, char **argv)
         " 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"
+        " commit        Commit changes\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"
+        " -n            Don't use commit system\n"
 	" -v <level>    Set logging to <level>.\n");
         exit (1);
     }
-    while ((ret = options ("t:c:g:d:m:v:", argv, argc, &arg)) != -2)
+    while ((ret = options ("t:c:g:d:m:v:n", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
+            const char *rval;
             if(cmd == 0) /* command */
             {
                 if (!common_resource)
                 {
-                    const char *rval;
                     common_resource = res_open (configName ?
                                                 configName : FNAME_CONFIG);
                     if (!common_resource)
@@ -164,16 +182,6 @@ int main (int argc, char **argv)
                         exit (1);
                     }
                     data1_tabpath = res_get (common_resource, "profilePath");
-                    rval = res_get (common_resource, "commitEnable");
-
-                    zebraIndexLock (1);
-                    if (rval && atoi(rval))
-                    {
-                        zebraIndexLockMsg ("r");
-                        bf_cache ();
-                    }
-                    else
-                        zebraIndexLockMsg ("w");
                 }
                 if (!strcmp (arg, "update"))
                     cmd = 'u';
@@ -181,12 +189,42 @@ int main (int argc, char **argv)
                     cmd = 'd';
                 else if (!strcmp (arg, "commit"))
                 {
-                    logf (LOG_LOG, "Commit");
-                    zebraIndexLockMsg ("c");
-                    bf_commit ();
+                    zebraIndexLock (1);
+                    rval = res_get (common_resource, "commit");
+                    if (rval && *rval)
+                        bf_cache (1);
+                    else
+                    {
+                        logf (LOG_FATAL, "Cannot perform commit");
+                        logf (LOG_FATAL, "No commit area defined "
+                              "in the configuration file");
+                        exit (1);
+                    }
+                    if (bf_commitExists ())
+                    {
+                        logf (LOG_LOG, "Commit start");
+                        zebraIndexLockMsg ("c");
+                        zebraIndexWait (1);
+                        logf (LOG_LOG, "Commit execute");
+                        bf_commitExec ();
+                        sync ();
+                        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);
+                    rval = res_get (common_resource, "commit");
+                    if (rval && *rval)
+                    {
+                        bf_cache (1);
+                        zebraIndexLockMsg ("r");
+                    }
                     rec_prstat ();
                 }
                 else
@@ -199,6 +237,20 @@ int main (int argc, char **argv)
             {
                 struct recordGroup rGroup;
 
+                zebraIndexLock (0);
+                rval = res_get (common_resource, "commit");
+                if (rval && *rval && !disableCommit)
+                {
+                    bf_cache (1);
+                    zebraIndexLockMsg ("r");
+                }
+                else
+                {
+                    bf_cache (0);
+                    zebraIndexLockMsg ("w");
+                }
+                zebraIndexWait (0);
+
                 memcpy (&rGroup, &rGroupDef, sizeof(rGroup));
                 key_open (mem_max);
                 rGroup.path = arg;
@@ -219,6 +271,7 @@ int main (int argc, char **argv)
                     logf (LOG_LOG, "Merging with index");
                     key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections,
                                60);
+                    sync ();
                 }
             }
         }
@@ -242,13 +295,15 @@ int main (int argc, char **argv)
             configName = arg;
         else if (ret == 't')
             rGroupDef.recordType = arg;
+        else if (ret == 'n')
+            disableCommit = 1;
         else
         {
             logf (LOG_FATAL, "Unknown option '-%s'", arg);
             exit (1);
         }
     }
-    zebraIndexUnlock (1);
+    zebraIndexUnlock ();
     exit (0);
 }