X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=574c212fe6d6f479bd4d2420d0dfb04fbe50a2fe;hb=226fb73f42a86cc30ff4f27eb452ab3f6c19ae01;hp=c81c1492f40cd0944a97b6c902b68bffaefc906e;hpb=79a521770393bd301230668a5ce950b754bd39c7;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index c81c149..574c212 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.24  1995-11-30 17:01:38  adam
+ * 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.
  *
@@ -101,13 +110,11 @@ extern char *data1_tabpath;
 
 int main (int argc, char **argv)
 {
-    int commit_at_end = 0;
     int ret;
     int cmd = 0;
     char *arg;
     char *configName = NULL;
     int nsections;
-    int key_open_flag = 0;
 
     struct recordGroup rGroupDef;
     
@@ -144,6 +151,7 @@ int main (int argc, char **argv)
             {
                 if (!common_resource)
                 {
+                    const char *rval;
                     common_resource = res_open (configName ?
                                                 configName : FNAME_CONFIG);
                     if (!common_resource)
@@ -153,14 +161,23 @@ int main (int argc, char **argv)
                         exit (1);
                     }
                     data1_tabpath = res_get (common_resource, "profilePath");
-                    bf_cache (res_get (common_resource, "commitCache"));
+                    rval = res_get (common_resource, "commitEnable");
+                    if (rval && atoi(rval))
+                        bf_cache ();
                 }
                 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;
+                {
+                    logf (LOG_LOG, "Commit");
+                    bf_commit ();
+                }
+                else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
+                {
+                    rec_prstat ();
+                }
                 else
                 {
                     logf (LOG_FATAL, "Unknown command: %s", arg);
@@ -172,17 +189,26 @@ int main (int argc, char **argv)
                 struct recordGroup rGroup;
 
                 memcpy (&rGroup, &rGroupDef, sizeof(rGroup));
-                if (!key_open_flag)
-                {
-                    key_open (mem_max);
-                    key_open_flag = 1;
-                }
+                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')
@@ -211,20 +237,6 @@ int main (int argc, char **argv)
             exit (1);
         }
     }
-    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);
 }