-/* $Id: main.c,v 1.100 2002-10-22 12:51:08 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: main.c,v 1.108 2003-11-24 12:58:00 mike Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
This file is part of the Zebra server.
#include <sys/times.h>
#endif
+#if HAVE_TCL_H
+#include <tcl.h>
+#endif
+
+#if HAVE_EXPAT_H
+#include <expat.h>
+#endif
+
#include <data1.h>
#include "zebraapi.h"
#if HAVE_SYS_TIMES_H
struct tms tms1, tms2;
struct timeval start_time, end_time;
- long usec;
+ double usec;
#endif
#ifndef WIN32
char nbuf[100];
" update <dir> Update index with files below <dir>.\n"
" If <dir> is empty filenames are read from stdin.\n"
" delete <dir> Delete index with files below <dir>.\n"
+ " create <db> Create database <db>\n"
+ " drop <db> Drop database <db>\n"
" commit Commit changes\n"
" clean Clean shadow files\n"
"Options:\n"
{
zebra_init (zh);
}
+ else if (!strcmp(arg, "drop"))
+ {
+ cmd = 'D';
+ }
+ else if (!strcmp(arg, "create"))
+ {
+ cmd = 'C';
+ }
else if (!strcmp (arg, "commit"))
{
zebra_commit (zh);
}
else if (!strcmp (arg, "clean"))
{
- assert (!"todo");
+ zebra_clean (zh);
}
else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
{
zebra_register_statistics (zh,0);
}
- else if (!strcmp (arg, "dump") || !strcmp (arg, "dumpdict"))
+ else if (!strcmp (arg, "dumpdict"))
{
zebra_register_statistics (zh,1);
}
if (!trans_started)
{
trans_started=1;
- zebra_begin_trans (zh);
+ if (zebra_begin_trans (zh, 1))
+ exit(1);
}
-
switch (cmd)
{
case 'u':
zebra_repository_show (zh);
nsections = 0;
break;
+ case 'C':
+ zebra_create_database(zh, rGroupDef.path);
+ break;
+ case 'D':
+ zebra_drop_database(zh, rGroupDef.path);
+ break;
default:
nsections = 0;
}
else if (ret == 'V')
{
printf("Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
- printf(" (C) 1994-2002, Index Data ApS\n");
+ printf(" (C) 1994-2003, Index Data ApS\n");
#ifdef WIN32
#ifdef _DEBUG
printf(" WIN32 Debug\n");
#endif
#endif
#if HAVE_BZLIB_H
- printf("libbzip2\n"
- " (C) 1996-1999 Julian R Seward. All rights reserved.\n");
+ printf("Using: libbzip2, (C) 1996-1999 Julian R Seward. All rights reserved.\n");
+#endif
+#if HAVE_TCL_H
+ printf("Using: Tcl %s\n", TCL_VERSION);
+#endif
+#if HAVE_EXPAT_H
+ if (1)
+ {
+ XML_Expat_Version v = XML_ExpatVersionInfo();
+ printf ("Using: Expat %d.%d.%d\n",
+ v.major, v.minor, v.micro);
+ }
#endif
}
else if (ret == 'v')
if (trans_started)
{
gettimeofday(&end_time, 0);
- usec = (end_time.tv_sec - start_time.tv_sec) * 1000000L +
+ usec = (end_time.tv_sec - start_time.tv_sec) * 1000000.0 +
end_time.tv_usec - start_time.tv_usec;
times(&tms2);
yaz_log (LOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f",
- (double) usec / 1000000.0,
+ usec / 1000000,
(double) (tms2.tms_utime - tms1.tms_utime)/100,
(double) (tms2.tms_stime - tms1.tms_stime)/100);
}
#endif
+ nmem_exit();
exit (0);
return 0;
}