-/* $Id: main.c,v 1.99 2002-10-22 09:37:55 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: main.c,v 1.125 2005-06-14 20:28:54 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
02111-1307, USA.
*/
-
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <assert.h>
#ifdef WIN32
#include <io.h>
-#else
+#endif
+#if HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <time.h>
#include <sys/times.h>
#endif
-#include <yaz/data1.h>
-#include "zebraapi.h"
+#include <yaz/log.h>
+#include <yaz/options.h>
+#include <idzebra/api.h>
char *prog;
+static void filter_cb(void *cd, const char *name)
+{
+ puts (name);
+}
+
+static void show_filters(ZebraService zs)
+{
+ zebra_filter_info(zs, 0, filter_cb);
+}
+
int main (int argc, char **argv)
{
int ret;
char *arg;
char *configName = 0;
int nsections = 0;
- int disableCommit = 0;
- char *mem_max = 0;
+ int enable_commit = 1;
+ char *database = 0;
+ Res res = res_open(0, 0, 0);
int trans_started=0;
#if HAVE_SYS_TIMES_H
struct tms tms1, tms2;
+ double usec;
+#endif
+#if HAVE_SYS_TIME_H
struct timeval start_time, end_time;
- long usec;
#endif
#ifndef WIN32
char nbuf[100];
#endif
- struct recordGroup rGroupDef;
ZebraService zs = 0;
ZebraHandle zh = 0;
#ifdef WIN32
#else
- sprintf(nbuf, "%.40s(%d)", *argv, getpid());
+ sprintf(nbuf, "%.40s(%ld)", *argv, (long) getpid());
yaz_log_init_prefix (nbuf);
#endif
#if HAVE_SYS_TIMES_H
times(&tms1);
+#endif
+#if HAVE_SYS_TIME_H
gettimeofday(&start_time, 0);
#endif
-
- rGroupDef.groupName = NULL;
- rGroupDef.databaseName = NULL;
- rGroupDef.path = NULL;
- rGroupDef.recordId = NULL;
- rGroupDef.recordType = NULL;
- rGroupDef.flagStoreData = -1;
- rGroupDef.flagStoreKeys = -1;
- rGroupDef.flagRw = 1;
- rGroupDef.databaseNamePath = 0;
- rGroupDef.explainDatabase = 0;
- rGroupDef.fileVerboseLimit = 100000;
- rGroupDef.followLinks = -1;
-
prog = *argv;
if (argc < 2)
{
" 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"
);
exit (1);
}
- while ((ret = options ("sVt:c:g:d:m:v:nf:l:L"
- , argv, argc, &arg)) != -2)
+ while ((ret = options("sVt:c:g:d:m:v:nf:l:L", argv, argc, &arg)) != -2)
{
if (ret == 0)
{
if (!zs)
{
const char *config = configName ? configName : "zebra.cfg";
- logf (LOG_LOG, "Zebra version %s %s",
+ yaz_log (YLOG_LOG, "Zebra version %s %s",
ZEBRAVER, ZEBRADATE);
- zs = zebra_start (config);
+ zs = zebra_start_res (config, 0, res);
if (!zs)
{
- yaz_log (LOG_FATAL, "Cannot read config %s", config);
+ yaz_log (YLOG_FATAL, "Cannot read config %s", config);
exit (1);
}
zh = zebra_open (zs);
- if (disableCommit)
- zebra_shadow_enable (zh, 0);
- }
-
- if (rGroupDef.databaseName)
- {
- if (zebra_select_database (zh, rGroupDef.databaseName))
- {
- logf(LOG_FATAL, "Could not select database %s errCode=%d",
- rGroupDef.databaseName, zebra_errCode(zh) );
- exit (1);
- }
- }
- else
- {
- if (zebra_select_database (zh, "Default"))
- {
- logf(LOG_FATAL, "Could not select database Default errCode=%d",
- zebra_errCode(zh) );
- exit (1);
- }
+ zebra_shadow_enable (zh, enable_commit);
}
- if (mem_max)
- zebra_set_resource(zh, "memmax",mem_max);
+ if (database &&
+ zebra_select_database (zh, database) == ZEBRA_FAIL)
+ {
+ yaz_log(YLOG_FATAL, "Could not select database %s "
+ "errCode=%d",
+ database, zebra_errCode(zh) );
+ exit (1);
+ }
if (!strcmp (arg, "update"))
cmd = 'u';
else if (!strcmp (arg, "update1"))
{
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);
}
{
zebra_compact (zh);
}
+ else if (!strcmp (arg, "filters"))
+ {
+ show_filters(zs);
+ }
else
{
- logf (LOG_FATAL, "unknown command: %s", arg);
+ yaz_log (YLOG_FATAL, "unknown command: %s", arg);
exit (1);
}
}
else
{
- rGroupDef.path = arg;
- zebra_set_group (zh, &rGroupDef);
+ ZEBRA_RES res = ZEBRA_OK;
if (!trans_started)
{
trans_started=1;
- zebra_begin_trans (zh);
+ if (zebra_begin_trans (zh, 1) != ZEBRA_OK)
+ exit(1);
}
-
switch (cmd)
{
case 'u':
- zebra_repository_update (zh);
+ res = zebra_repository_update (zh, arg);
break;
case 'd':
- zebra_repository_delete (zh);
+ res = zebra_repository_delete (zh, arg);
break;
case 's':
- logf (LOG_LOG, "dumping %s", rGroupDef.path);
- zebra_repository_show (zh);
+ res = zebra_repository_show (zh, arg);
nsections = 0;
break;
+ case 'C':
+ res = zebra_create_database(zh, arg);
+ break;
+ case 'D':
+ res = zebra_drop_database(zh, arg);
+ break;
default:
nsections = 0;
}
+ if (res != ZEBRA_OK)
+ {
+ yaz_log(YLOG_WARN, "Operation failed");
+ exit(1);
+ }
log_event_end (NULL, NULL);
}
}
else if (ret == 'V')
{
printf("Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
- printf(" (C) 1994-2002, Index Data ApS\n");
+ printf(" (C) 1994-2005, 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
}
else if (ret == 'v')
else if (ret == 'l')
yaz_log_init_file (arg);
else if (ret == 'm')
- mem_max = arg;
+ res_set(res, "memMax", arg);
else if (ret == 'd')
- rGroupDef.databaseName = arg;
+ database = arg;
else if (ret == 's')
- rGroupDef.flagRw = 0;
+ res_set(res, "openRW", "0");
else if (ret == 'g')
- rGroupDef.groupName = arg;
+ res_set(res, "group", arg);
else if (ret == 'f')
- rGroupDef.fileVerboseLimit = atoi(arg);
+ res_set(res, "fileVerboseLimit", arg);
else if (ret == 'c')
configName = arg;
else if (ret == 't')
- rGroupDef.recordType = arg;
+ res_set(res, "recordType", arg);
else if (ret == 'n')
- disableCommit = 1;
- else if (ret == 'L')
- rGroupDef.followLinks = 0;
+ enable_commit = 0;
+ else if (ret == 'L')
+ res_set(res, "followLinks", "0");
else
- logf (LOG_WARN, "unknown option '-%s'", arg);
+ yaz_log (YLOG_WARN, "unknown option '-%s'", arg);
} /* while arg */
if (trans_started)
zebra_close (zh);
zebra_stop (zs);
#if HAVE_SYS_TIMES_H
+#if HAVE_SYS_TIME_H
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,
+ yaz_log (YLOG_LOG, "zebraidx times: %5.2f %5.2f %5.2f",
+ usec / 1000000,
(double) (tms2.tms_utime - tms1.tms_utime)/100,
(double) (tms2.tms_stime - tms1.tms_stime)/100);
}
#endif
+#endif
+ nmem_exit();
exit (0);
return 0;
}
projects / idzebra-moved-to-github.git / blobdiff