Fixed notification of live-updates. Fixed minor problem with mf_init

[idzebra-moved-to-github.git] / index / main.c

diff --git a/index/main.c b/index/main.c
index 2a1b691..c2b16c1 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,21 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.74  1999-12-08 15:03:11  adam
+ * Revision 1.78  2000-10-17 12:37:09  adam
+ * Fixed notification of live-updates. Fixed minor problem with mf_init
+ * where it didn't handle shadow area file names correctly.
+ *
+ * Revision 1.77  2000/09/05 14:04:05  adam
+ * Updates for prefix 'yaz_' for YAZ log functions.
+ *
+ * Revision 1.76  2000/03/20 19:08:36  adam
+ * Added remote record import using Z39.50 extended services and Segment
+ * Requests.
+ *
+ * Revision 1.75  1999/12/08 22:44:45  adam
+ * Zebra/Z'mbol dependencies added.
+ *
+ * Revision 1.74  1999/12/08 15:03:11  adam
  * Implemented bf_reset.
  *
  *
@@ -331,7 +345,7 @@ int main (int argc, char **argv)
     prog = *argv;
     if (argc < 2)
     {
-        fprintf (stderr, "zebraidx [options] command <dir> ...\n"
+        fprintf (stderr, "%s [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"
@@ -352,7 +366,7 @@ int main (int argc, char **argv)
 #if ZEBRASDR
        " -S            Use SDRKit\n"
 #endif
-        " -V            Show version.\n"
+        " -V            Show version.\n", *argv
                  );
         exit (1);
     }
@@ -369,8 +383,13 @@ int main (int argc, char **argv)
             {
                 if (!common_resource)
                 {
+#if ZMBOL
+                    logf (LOG_LOG, "zmbol version %s %s",
+                          ZEBRAVER, ZEBRADATE);
+#else
                     logf (LOG_LOG, "zebra version %s %s",
                           ZEBRAVER, ZEBRADATE);
+#endif
                     common_resource = res_open (configName ?
                                                 configName : FNAME_CONFIG);
                     if (!common_resource)
@@ -408,6 +427,8 @@ int main (int argc, char **argv)
                    zebraIndexUnlock(); 
                    rval = res_get (common_resource, "shadow");
                    zebraIndexLock (rGroupDef.bfs, 0, rval);
+                   if (rval && *rval)
+                       bf_cache (rGroupDef.bfs, rval);
                    zebraIndexLockMsg ("w");
                    bf_reset (rGroupDef.bfs);
                }
@@ -439,7 +460,7 @@ int main (int argc, char **argv)
                         bf_commitClean (rGroupDef.bfs, rval);
                     }
                     else
-                        logf (LOG_LOG, "cothing to commit");
+                        logf (LOG_LOG, "nothing to commit");
                 }
                 else if (!strcmp (arg, "clean"))
                 {
@@ -559,7 +580,7 @@ int main (int argc, char **argv)
                 if (nsections)
                 {
                     logf (LOG_LOG, "merging with index");
-                    key_input (rGroup.bfs, nsections, 60);
+                    key_input (rGroup.bfs, nsections, 60, common_resource);
 #ifndef WIN32
                     sync ();
 #endif
@@ -588,9 +609,9 @@ int main (int argc, char **argv)
 #endif
         }
         else if (ret == 'v')
-            log_init_level (log_mask_str(arg));
+            yaz_log_init_level (yaz_log_mask_str(arg));
        else if (ret == 'l')
-           log_init_file (arg);
+           yaz_log_init_file (arg);
         else if (ret == 'm')
             mem_max = 1024*1024*atoi(arg);
         else if (ret == 'd')