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
additional information on zebra functionalities and attribute lists added
[idzebra-moved-to-github.git]
/
index
/
main.c
diff --git
a/index/main.c
b/index/main.c
index
6038469
..
6ccc1f5
100644
(file)
--- a/
index/main.c
+++ b/
index/main.c
@@
-1,4
+1,4
@@
-/* $Id: main.c,v 1.124 2005-05-11 12:39:36 adam Exp $
+/* $Id: main.c,v 1.129 2006-05-10 08:13:22 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-26,8
+26,11
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <assert.h>
#ifdef WIN32
#include <io.h>
#include <assert.h>
#ifdef WIN32
#include <io.h>
-#else
+#endif
+#if HAVE_UNISTD_H
#include <unistd.h>
#include <unistd.h>
+#endif
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <time.h>
#include <sys/time.h>
#endif
#include <time.h>
@@
-60,14
+63,16
@@
int main (int argc, char **argv)
int nsections = 0;
int enable_commit = 1;
char *database = 0;
int nsections = 0;
int enable_commit = 1;
char *database = 0;
- Res res = res_open(0, 0, 0);
+ Res res = res_open(0, 0);
int trans_started=0;
#if HAVE_SYS_TIMES_H
struct tms tms1, tms2;
int trans_started=0;
#if HAVE_SYS_TIMES_H
struct tms tms1, tms2;
- struct timeval start_time, end_time;
double usec;
#endif
double usec;
#endif
+#if HAVE_SYS_TIME_H
+ struct timeval start_time, end_time;
+#endif
#ifndef WIN32
char nbuf[100];
#endif
#ifndef WIN32
char nbuf[100];
#endif
@@
-83,6
+88,8
@@
int main (int argc, char **argv)
#endif
#if HAVE_SYS_TIMES_H
times(&tms1);
#endif
#if HAVE_SYS_TIMES_H
times(&tms1);
+#endif
+#if HAVE_SYS_TIME_H
gettimeofday(&start_time, 0);
#endif
prog = *argv;
gettimeofday(&start_time, 0);
#endif
prog = *argv;
@@
-122,15
+129,13
@@
int main (int argc, char **argv)
if (!zs)
{
const char *config = configName ? configName : "zebra.cfg";
if (!zs)
{
const char *config = configName ? configName : "zebra.cfg";
- yaz_log (YLOG_LOG, "Zebra version %s %s",
- ZEBRAVER, ZEBRADATE);
zs = zebra_start_res (config, 0, res);
if (!zs)
{
yaz_log (YLOG_FATAL, "Cannot read config %s", config);
exit (1);
}
zs = zebra_start_res (config, 0, res);
if (!zs)
{
yaz_log (YLOG_FATAL, "Cannot read config %s", config);
exit (1);
}
- zh = zebra_open (zs);
+ zh = zebra_open (zs, 0);
zebra_shadow_enable (zh, enable_commit);
}
zebra_shadow_enable (zh, enable_commit);
}
@@
-274,11
+279,13
@@
int main (int argc, char **argv)
} /* while arg */
if (trans_started)
} /* while arg */
if (trans_started)
- zebra_end_trans (zh);
+ if (zebra_end_trans (zh) != ZEBRA_OK)
+ yaz_log (YLOG_WARN, "zebra_end_trans failed");
zebra_close (zh);
zebra_stop (zs);
#if HAVE_SYS_TIMES_H
zebra_close (zh);
zebra_stop (zs);
#if HAVE_SYS_TIMES_H
+#if HAVE_SYS_TIME_H
if (trans_started)
{
gettimeofday(&end_time, 0);
if (trans_started)
{
gettimeofday(&end_time, 0);
@@
-291,8
+298,17
@@
int main (int argc, char **argv)
(double) (tms2.tms_stime - tms1.tms_stime)/100);
}
#endif
(double) (tms2.tms_stime - tms1.tms_stime)/100);
}
#endif
+#endif
nmem_exit();
exit (0);
return 0;
}
nmem_exit();
exit (0);
return 0;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+