projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated WIN32 code specific sections. Changed header.
[idzebra-moved-to-github.git]
/
index
/
main.c
diff --git
a/index/main.c
b/index/main.c
index
45da827
..
25dcd26
100644
(file)
--- a/
index/main.c
+++ b/
index/main.c
@@
-1,10
+1,16
@@
/*
/*
- * Copyright (C) 1994-1998, Index Data
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: main.c,v $
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: main.c,v $
- * Revision 1.59 1998-10-16 08:14:32 adam
+ * Revision 1.61 1999-02-02 14:51:00 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.60 1998/10/28 10:54:39 adam
+ * SDRKit integration.
+ *
+ * Revision 1.59 1998/10/16 08:14:32 adam
* Updated record control system.
*
* Revision 1.58 1998/06/08 14:43:13 adam
* Updated record control system.
*
* Revision 1.58 1998/06/08 14:43:13 adam
@@
-222,7
+228,7
@@
*/
#include <stdio.h>
#include <assert.h>
*/
#include <stdio.h>
#include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#include <io.h>
#else
#include <unistd.h>
@@
-232,6
+238,14
@@
#include "index.h"
#include "recindex.h"
#include "index.h"
#include "recindex.h"
+#ifndef ZEBRASDR
+#define ZEBRASDR 0
+#endif
+
+#if ZEBRASDR
+#include "zebrasdr.h"
+#endif
+
char *prog;
Res common_resource = 0;
char *prog;
Res common_resource = 0;
@@
-250,6
+264,9
@@
int main (int argc, char **argv)
nmem_init ();
nmem_init ();
+#if ZEBRASDR
+ zebraSdr_std ();
+#endif
rGroupDef.groupName = NULL;
rGroupDef.databaseName = NULL;
rGroupDef.path = NULL;
rGroupDef.groupName = NULL;
rGroupDef.databaseName = NULL;
rGroupDef.path = NULL;
@@
-290,7
+307,7
@@
int main (int argc, char **argv)
);
exit (1);
}
);
exit (1);
}
- while ((ret = options ("sVt:c:g:d:m:v:nf:", argv, argc, &arg)) != -2)
+ while ((ret = options ("sVt:c:g:d:m:v:nf:l:", argv, argc, &arg)) != -2)
{
if (ret == 0)
{
{
if (ret == 0)
{
@@
-348,7
+365,7
@@
int main (int argc, char **argv)
zebraIndexWait (1);
logf (LOG_LOG, "commit execute");
bf_commitExec (rGroupDef.bfs);
zebraIndexWait (1);
logf (LOG_LOG, "commit execute");
bf_commitExec (rGroupDef.bfs);
-#ifndef WINDOWS
+#ifndef WIN32
sync ();
#endif
zebraIndexLockMsg ("d");
sync ();
#endif
zebraIndexLockMsg ("d");
@@
-459,7
+476,7
@@
int main (int argc, char **argv)
{
logf (LOG_LOG, "merging with index");
key_input (rGroup.bfs, nsections, 60);
{
logf (LOG_LOG, "merging with index");
key_input (rGroup.bfs, nsections, 60);
-#ifndef WINDOWS
+#ifndef WIN32
sync ();
#endif
}
sync ();
#endif
}
@@
-471,7
+488,9
@@
int main (int argc, char **argv)
fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
}
else if (ret == 'v')
fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
}
else if (ret == 'v')
- log_init (log_mask_str(arg), prog, NULL);
+ log_init_level (log_mask_str(arg));
+ else if (ret == 'l')
+ log_init_file (arg);
else if (ret == 'm')
mem_max = 1024*1024*atoi(arg);
else if (ret == 'd')
else if (ret == 'm')
mem_max = 1024*1024*atoi(arg);
else if (ret == 'd')