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
Index statistics working again
[idzebra-moved-to-github.git]
/
index
/
main.c
diff --git
a/index/main.c
b/index/main.c
index
3508f2a
..
73a0515
100644
(file)
--- a/
index/main.c
+++ b/
index/main.c
@@
-2,7
+2,7
@@
* Copyright (C) 1994-2002, Index Data
* All rights reserved.
*
* Copyright (C) 1994-2002, Index Data
* All rights reserved.
*
- * $Id: main.c,v 1.82 2002-02-20 17:30:01 adam Exp $
+ * $Id: main.c,v 1.89 2002-04-26 08:44:47 adam Exp $
*/
#include <stdio.h>
#include <string.h>
*/
#include <stdio.h>
#include <string.h>
@@
-12,12
+12,12
@@
#else
#include <unistd.h>
#endif
#else
#include <unistd.h>
#endif
+#if HAVE_SYS_TIMES_H
+#include <sys/times.h>
+#endif
#include <yaz/data1.h>
#include "zebraapi.h"
#include <yaz/data1.h>
#include "zebraapi.h"
-#include "zserver.h"
-#include "index.h"
-#include "recindex.h"
char *prog;
char *prog;
@@
-30,6
+30,9
@@
int main (int argc, char **argv)
int nsections = 0;
int disableCommit = 0;
size_t mem_max = 0;
int nsections = 0;
int disableCommit = 0;
size_t mem_max = 0;
+#if HAVE_SYS_TIMES_H
+ struct tms tms1, tms2;
+#endif
#ifndef WIN32
char nbuf[100];
#endif
#ifndef WIN32
char nbuf[100];
#endif
@@
-44,6
+47,9
@@
int main (int argc, char **argv)
sprintf(nbuf, "%.40s(%d)", *argv, getpid());
yaz_log_init_prefix (nbuf);
#endif
sprintf(nbuf, "%.40s(%d)", *argv, getpid());
yaz_log_init_prefix (nbuf);
#endif
+#if HAVE_SYS_TIMES_H
+ times(&tms1);
+#endif
rGroupDef.groupName = NULL;
rGroupDef.databaseName = NULL;
rGroupDef.groupName = NULL;
rGroupDef.databaseName = NULL;
@@
-92,16
+98,30
@@
int main (int argc, char **argv)
if (!zs)
{
#if ZMBOL
if (!zs)
{
#if ZMBOL
- logf (LOG_LOG, "zmbol version %s %s",
+ logf (LOG_LOG, "Z'mbol version %s %s",
ZEBRAVER, ZEBRADATE);
#else
ZEBRAVER, ZEBRADATE);
#else
- logf (LOG_LOG, "zebra version %s %s",
+ logf (LOG_LOG, "Zebra version %s %s",
ZEBRAVER, ZEBRADATE);
#endif
ZEBRAVER, ZEBRADATE);
#endif
- zs = zebra_start (configName ? configName : FNAME_CONFIG);
-
+ zs = zebra_start (configName ? configName : "zebra.cfg");
+ if (!zs)
+ exit (1);
zh = zebra_open (zs);
zh = zebra_open (zs);
+ if (disableCommit)
+ zebra_shadow_enable (zh, 0);
+ }
+ if (rGroupDef.databaseName)
+ {
+ if (zebra_select_database (zh, rGroupDef.databaseName))
+ exit (1);
}
}
+ else
+ {
+ if (zebra_select_database (zh, "Default"))
+ exit (1);
+ }
+
if (!strcmp (arg, "update"))
cmd = 'u';
else if (!strcmp (arg, "update1"))
if (!strcmp (arg, "update"))
cmd = 'u';
else if (!strcmp (arg, "update1"))
@@
-126,7
+146,7
@@
int main (int argc, char **argv)
}
else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
{
}
else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
{
- assert (!"todo");
+ zebra_register_statistics (zh);
}
else if (!strcmp (arg, "compact"))
{
}
else if (!strcmp (arg, "compact"))
{
@@
-140,10
+160,10
@@
int main (int argc, char **argv)
}
else
{
}
else
{
- memcpy (&zh->rGroup, &rGroupDef, sizeof(rGroupDef));
+ rGroupDef.path = arg;
+ zebra_set_group (zh, &rGroupDef);
zebra_begin_trans (zh);
zebra_begin_trans (zh);
- zh->rGroup.path = arg;
switch (cmd)
{
case 'u':
switch (cmd)
{
case 'u':
@@
-153,7
+173,7
@@
int main (int argc, char **argv)
zebra_repository_delete (zh);
break;
case 's':
zebra_repository_delete (zh);
break;
case 's':
- logf (LOG_LOG, "dumping %s", zh->rGroup.path);
+ logf (LOG_LOG, "dumping %s", rGroupDef.path);
zebra_repository_show (zh);
nsections = 0;
break;
zebra_repository_show (zh);
nsections = 0;
break;
@@
-210,6
+230,12
@@
int main (int argc, char **argv)
}
zebra_close (zh);
zebra_stop (zs);
}
zebra_close (zh);
zebra_stop (zs);
+#if HAVE_SYS_TIMES_H
+ times(&tms2);
+ yaz_log (LOG_LOG, "zebraidx user/system: %ld/%ld",
+ (long) tms2.tms_utime - tms1.tms_utime,
+ (long) tms2.tms_stime - tms1.tms_stime);
+#endif
exit (0);
return 0;
}
exit (0);
return 0;
}