X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=c2b16c194c981fa18af623cb18236420d9358b0e;hb=1ccf2613ceef2359f589cb3dd7e72a899c618b2f;hp=d10fbccd3b3c10ec2b43a15f4465df978abdcd95;hpb=e150e51a7e20a902e9fd2f11f00811f94f67d529;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index d10fbcc..c2b16c1 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,25 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.73  1999-11-30 13:48:03  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.
+ *
+ *
+ * Revision 1.73  1999/11/30 13:48:03  adam
  * Improved installation. Updated for inclusion of YAZ header files.
  *
  * Revision 1.72  1999/10/14 14:33:50  adam
@@ -289,6 +307,7 @@ char *prog;
 
 Res common_resource = 0;
 
+
 int main (int argc, char **argv)
 {
     int ret;
@@ -326,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"
@@ -347,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);
     }
@@ -364,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)
@@ -398,6 +422,16 @@ int main (int argc, char **argv)
                     cmd = 's';
                 else if (!strcmp (arg, "del") || !strcmp(arg, "delete"))
                     cmd = 'd';
+		else if (!strcmp (arg, "init"))
+		{
+		    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);
+		}
                 else if (!strcmp (arg, "commit"))
                 {
                     rval = res_get (common_resource, "shadow");
@@ -426,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"))
                 {
@@ -477,7 +511,15 @@ int main (int argc, char **argv)
 	    else
             {
                 struct recordGroup rGroup;
-
+#if ZMBOL
+#else
+		/* For zebra, delete lock file and reset register */
+		if (rGroupDef.flagRw)
+		{
+		    zebraIndexUnlock();
+		    bf_reset (rGroupDef.bfs);
+		}
+#endif
                 rval = res_get (common_resource, "shadow");
                 zebraIndexLock (rGroupDef.bfs, 0, rval);
 		if (rGroupDef.flagRw)
@@ -538,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
@@ -548,7 +590,11 @@ int main (int argc, char **argv)
         }
         else if (ret == 'V')
         {
+#if ZMBOL
+            fprintf (stderr, "Z'mbol %s %s\n", ZEBRAVER, ZEBRADATE);
+#else
             fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
+#endif
 	    fprintf (stderr, " (C) 1994-1999, Index Data ApS\n");
 #ifdef WIN32
 #ifdef _DEBUG
@@ -563,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')