X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=51b475e8a575fe900e6d80613d1426c4b44318c9;hb=869b11178c518bf4b8c81e1cb5daca8cfc8a17c6;hp=f40cd03e4d14a35ae6500db349737e52b232f038;hpb=bf27228e5485151ee52bfd87dd91b025544ab6b2;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index f40cd03..51b475e 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,31 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.28  1995-12-08 16:22:56  adam
+ * Revision 1.34  1996-02-07 14:06:39  adam
+ * Better progress report during register merge.
+ * New command: clean - removes temporary shadow files.
+ *
+ * Revision 1.33  1996/02/06  17:11:18  adam
+ * Minor changes.
+ *
+ * Revision 1.32  1996/02/01  20:50:04  adam
+ * Bug fix: zebraIndexUnlock was always called even though zebraIndexLock
+ * was never called - happens when no commands are specified.
+ *
+ * Revision 1.31  1996/01/08  19:15:46  adam
+ * New input filter that works!
+ *
+ * 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.
@@ -116,6 +140,12 @@ char *prog;
 size_t mem_max = 4*1024*1024;
 extern char *data1_tabpath;
 
+static void abort_func (int level, const char *msg, void *info)
+{
+    if (level & LOG_FATAL)
+        abort ();
+}
+
 int main (int argc, char **argv)
 {
     int ret;
@@ -123,6 +153,7 @@ int main (int argc, char **argv)
     char *arg;
     char *configName = NULL;
     int nsections;
+    int disableCommit = 0;
 
     struct recordGroup rGroupDef;
     
@@ -142,16 +173,20 @@ 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"
+        " clean         Clean shadow files\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 shadow system\n"
 	" -v <level>    Set logging to <level>.\n");
         exit (1);
     }
-    while ((ret = options ("t:c:g:d:m:v:", argv, argc, &arg)) != -2)
+    log_event_end (abort_func, NULL);
+    while ((ret = options ("t:c:g:d:m:v:n", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
@@ -177,10 +212,15 @@ int main (int argc, char **argv)
                 else if (!strcmp (arg, "commit"))
                 {
                     zebraIndexLock (1);
-                    rval = res_get (common_resource, "commitEnable");
-                    if (rval && atoi (rval))
+                    rval = res_get (common_resource, "shadow");
+                    if (rval && *rval)
                         bf_cache (1);
-
+                    else
+                    {
+                        logf (LOG_FATAL, "Cannot perform commit");
+                        logf (LOG_FATAL, "No shadow area defined");
+                        exit (1);
+                    }
                     if (bf_commitExists ())
                     {
                         logf (LOG_LOG, "Commit start");
@@ -188,6 +228,7 @@ int main (int argc, char **argv)
                         zebraIndexWait (1);
                         logf (LOG_LOG, "Commit execute");
                         bf_commitExec ();
+                        sync ();
                         zebraIndexLockMsg ("d");
                         zebraIndexWait (0);
                         logf (LOG_LOG, "Commit clean");
@@ -196,17 +237,24 @@ int main (int argc, char **argv)
                     else
                         logf (LOG_LOG, "Nothing to commit");
                 }
-                else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
+                else if (!strcmp (arg, "clean"))
                 {
                     zebraIndexLock (0);
-                    bf_cache (0);
-                    rec_prstat ();
+                    if (bf_commitExists ())
+                    {
+                        zebraIndexLockMsg ("d");
+                        zebraIndexWait (0);
+                        logf (LOG_LOG, "Commit clean");
+                        bf_commitClean ();
+                    }
+                    else
+                        logf (LOG_LOG, "Nothing to clean");
                 }
-                else if (!strcmp (arg, "cstat") || !strcmp (arg, "cstatus"))
+                else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
                 {
-                    zebraIndexLock (1);
-                    rval = res_get (common_resource, "commitEnable");
-                    if (rval && atoi(rval))
+                    zebraIndexLock (0);
+                    rval = res_get (common_resource, "shadow");
+                    if (rval && *rval)
                     {
                         bf_cache (1);
                         zebraIndexLockMsg ("r");
@@ -224,14 +272,17 @@ int main (int argc, char **argv)
                 struct recordGroup rGroup;
 
                 zebraIndexLock (0);
-                rval = res_get (common_resource, "commitEnable");
-                if (rval && atoi(rval))
+                rval = res_get (common_resource, "shadow");
+                if (rval && *rval && !disableCommit)
                 {
                     bf_cache (1);
                     zebraIndexLockMsg ("r");
                 }
                 else
+                {
+                    bf_cache (0);
                     zebraIndexLockMsg ("w");
+                }
                 zebraIndexWait (0);
 
                 memcpy (&rGroup, &rGroupDef, sizeof(rGroup));
@@ -254,6 +305,7 @@ int main (int argc, char **argv)
                     logf (LOG_LOG, "Merging with index");
                     key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections,
                                60);
+                    sync ();
                 }
             }
         }
@@ -277,13 +329,16 @@ 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 ();
+    if (common_resource)
+        zebraIndexUnlock ();
     exit (0);
 }