X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=574c212fe6d6f479bd4d2420d0dfb04fbe50a2fe;hb=d23f1adde49e76cfda218d7f50ba886c16d1a044;hp=140ef986b99847cf1c3d7950ff7a504eb787704e;hpb=162fa86044b5aa303c03fa26f1ecf140b34060d5;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 140ef98..574c212 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,24 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.22  1995-11-28 09:09:42  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.
+ *
+ * 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
@@ -98,7 +115,6 @@ int main (int argc, char **argv)
     char *arg;
     char *configName = NULL;
     int nsections;
-    int key_open_flag = 0;
 
     struct recordGroup rGroupDef;
     
@@ -113,20 +129,55 @@ int main (int argc, char **argv)
     prog = *argv;
     if (argc < 2)
     {
-        fprintf (stderr, "index [-v log] [-m meg] [-c config] [-d base]"
-                 " [-g group] [update|del dir] ...\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 (!common_resource)
+                {
+                    const char *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");
+                    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"))
+                {
+                    logf (LOG_LOG, "Commit");
+                    bf_commit ();
+                }
+                else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
+                {
+                    rec_prstat ();
+                }
                 else
                 {
                     logf (LOG_FATAL, "Unknown command: %s", arg);
@@ -138,30 +189,26 @@ int main (int argc, char **argv)
                 struct recordGroup rGroup;
 
                 memcpy (&rGroup, &rGroupDef, sizeof(rGroup));
-                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");
-                    assert (data1_tabpath);
-                }
-                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')
@@ -190,13 +237,6 @@ int main (int argc, char **argv)
             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);
     exit (0);
 }