X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=79104a824026777dc0ed52f6a786fce3ca495d30;hb=69da23537c6bb71ab948e079708bf8ea090de73f;hp=d10fbccd3b3c10ec2b43a15f4465df978abdcd95;hpb=e150e51a7e20a902e9fd2f11f00811f94f67d529;p=idzebra-moved-to-github.git
diff --git a/index/main.c b/index/main.c
index d10fbcc..79104a8 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,18 @@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: main.c,v $
- * Revision 1.73 1999-11-30 13:48:03 adam
+ * 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 +300,7 @@ char *prog;
Res common_resource = 0;
+
int main (int argc, char **argv)
{
int ret;
@@ -326,7 +338,7 @@ int main (int argc, char **argv)
prog = *argv;
if (argc < 2)
{
- fprintf (stderr, "zebraidx [options] command
...\n"
+ fprintf (stderr, "%s [options] command ...\n"
"Commands:\n"
" update Update index with files below .\n"
" If is empty filenames are read from stdin.\n"
@@ -347,7 +359,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 +376,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 +415,14 @@ 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);
+ zebraIndexLockMsg ("w");
+ bf_reset (rGroupDef.bfs);
+ }
else if (!strcmp (arg, "commit"))
{
rval = res_get (common_resource, "shadow");
@@ -477,7 +502,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 +571,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 +581,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