-/*
- * Copyright (C) 1994-2001, Index Data
- * All rights reserved.
- *
- * $Id: main.c,v 1.81 2001-11-19 23:29:09 adam Exp $
- */
+/* $Id: main.c,v 1.100 2002-10-22 12:51:08 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+ Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
#include <stdio.h>
#include <string.h>
#include <assert.h>
#include <io.h>
#else
#include <unistd.h>
+#include <sys/time.h>
#endif
-
-#include <yaz/data1.h>
-#include "index.h"
-#include "recindex.h"
-
-#ifndef ZEBRASDR
-#define ZEBRASDR 0
+#include <time.h>
+#if HAVE_SYS_TIMES_H
+#include <sys/times.h>
#endif
-#if ZEBRASDR
-#include "zebrasdr.h"
-#endif
+#include <data1.h>
+#include "zebraapi.h"
char *prog;
-Res common_resource = 0;
-
-
int main (int argc, char **argv)
{
int ret;
int cmd = 0;
char *arg;
- char *configName = FNAME_CONFIG;
+ char *configName = 0;
int nsections = 0;
int disableCommit = 0;
- size_t mem_max = 0;
+ char *mem_max = 0;
+
+ int trans_started=0;
+#if HAVE_SYS_TIMES_H
+ struct tms tms1, tms2;
+ struct timeval start_time, end_time;
+ long usec;
+#endif
#ifndef WIN32
char nbuf[100];
#endif
struct recordGroup rGroupDef;
+ ZebraService zs = 0;
+ ZebraHandle zh = 0;
nmem_init ();
sprintf(nbuf, "%.40s(%d)", *argv, getpid());
yaz_log_init_prefix (nbuf);
#endif
-
-#if ZEBRASDR
- zebraSdr_std ();
- rGroupDef.useSDR = 0;
+#if HAVE_SYS_TIMES_H
+ times(&tms1);
+ gettimeofday(&start_time, 0);
#endif
+
rGroupDef.groupName = NULL;
rGroupDef.databaseName = NULL;
rGroupDef.path = NULL;
rGroupDef.databaseNamePath = 0;
rGroupDef.explainDatabase = 0;
rGroupDef.fileVerboseLimit = 100000;
- rGroupDef.zebra_maps = NULL;
- rGroupDef.dh = data1_create ();
- rGroupDef.recTypes = recTypes_init (rGroupDef.dh);
- recTypes_default_handlers (rGroupDef.recTypes);
+ rGroupDef.followLinks = -1;
prog = *argv;
if (argc < 2)
" -s Show analysis on stdout, but do no work.\n"
" -v <level> Set logging to <level>.\n"
" -l <file> Write log to <file>.\n"
+ " -L Don't follow symbolic links.\n"
" -f <n> Display information for the first <n> records.\n"
-#if ZEBRASDR
- " -S Use SDRKit\n"
-#endif
" -V Show version.\n", *argv
);
exit (1);
}
- while ((ret = options ("sVt:c:g:d:m:v:nf:l:"
-#if ZEBRASDR
- "S"
-#endif
+ while ((ret = options ("sVt:c:g:d:m:v:nf:l:L"
, argv, argc, &arg)) != -2)
{
if (ret == 0)
{
- const char *rval;
if(cmd == 0) /* command */
{
- if (!common_resource)
+ if (!zs)
{
-#if ZMBOL
- logf (LOG_LOG, "zmbol version %s %s",
- ZEBRAVER, ZEBRADATE);
-#else
- logf (LOG_LOG, "zebra version %s %s",
+ const char *config = configName ? configName : "zebra.cfg";
+ logf (LOG_LOG, "Zebra version %s %s",
ZEBRAVER, ZEBRADATE);
-#endif
- common_resource = res_open (configName ?
- configName : FNAME_CONFIG);
- if (!common_resource)
+ zs = zebra_start (config);
+ if (!zs)
{
- logf (LOG_FATAL, "cannot read file `%s'", configName);
+ yaz_log (LOG_FATAL, "Cannot read config %s", config);
exit (1);
- }
- data1_set_tabpath (rGroupDef.dh, res_get (common_resource,
- "profilePath"));
-
- rGroupDef.bfs =
- bfs_create (res_get (common_resource, "register"));
- if (!rGroupDef.bfs)
- {
- logf (LOG_FATAL, "Cannot access register");
- exit(1);
- }
+ }
+ zh = zebra_open (zs);
+ if (disableCommit)
+ zebra_shadow_enable (zh, 0);
+ }
- bf_lockDir (rGroupDef.bfs,
- res_get (common_resource, "lockDir"));
- rGroupDef.zebra_maps = zebra_maps_open (common_resource);
+ 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);
+ }
}
+ if (mem_max)
+ zebra_set_resource(zh, "memmax",mem_max);
+
if (!strcmp (arg, "update"))
cmd = 'u';
else if (!strcmp (arg, "update1"))
cmd = 'd';
else if (!strcmp (arg, "init"))
{
- zebraIndexUnlock();
- rval = res_get (common_resource, "shadow");
- zebraIndexLock (rGroupDef.bfs, 0, rval);
- if (rval && *rval)
- bf_cache (rGroupDef.bfs, rval);
- zebraIndexLockMsg ("w");
- bf_reset (rGroupDef.bfs);
+ zebra_init (zh);
}
else if (!strcmp (arg, "commit"))
{
- rval = res_get (common_resource, "shadow");
- zebraIndexLock (rGroupDef.bfs, 1, rval);
- if (rval && *rval)
- bf_cache (rGroupDef.bfs, rval);
- else
- {
- logf (LOG_FATAL, "Cannot perform commit");
- logf (LOG_FATAL, "No shadow area defined");
- exit (1);
- }
- if (bf_commitExists (rGroupDef.bfs))
- {
- logf (LOG_LOG, "commit start");
- zebraIndexLockMsg ("c");
- zebraIndexWait (1);
- logf (LOG_LOG, "commit execute");
- bf_commitExec (rGroupDef.bfs);
-#ifndef WIN32
- sync ();
-#endif
- zebraIndexLockMsg ("d");
- zebraIndexWait (0);
- logf (LOG_LOG, "commit clean");
- bf_commitClean (rGroupDef.bfs, rval);
- }
- else
- logf (LOG_LOG, "nothing to commit");
+ zebra_commit (zh);
}
else if (!strcmp (arg, "clean"))
{
- rval = res_get (common_resource, "shadow");
- zebraIndexLock (rGroupDef.bfs, 1, rval);
- if (bf_commitExists (rGroupDef.bfs))
- {
- zebraIndexLockMsg ("d");
- zebraIndexWait (0);
- logf (LOG_LOG, "commit clean");
- bf_commitClean (rGroupDef.bfs, rval);
- }
- else
- logf (LOG_LOG, "nothing to clean");
+ assert (!"todo");
}
else if (!strcmp (arg, "stat") || !strcmp (arg, "status"))
{
- Records records;
- rval = res_get (common_resource, "shadow");
- zebraIndexLock (rGroupDef.bfs, 0, rval);
- if (rval && *rval)
- {
- bf_cache (rGroupDef.bfs, rval);
- zebraIndexLockMsg ("r");
- }
- records = rec_open (rGroupDef.bfs, 0, 0);
- rec_prstat (records);
- rec_close (&records);
- inv_prstat (rGroupDef.bfs);
+ zebra_register_statistics (zh,0);
+ }
+ else if (!strcmp (arg, "dump") || !strcmp (arg, "dumpdict"))
+ {
+ zebra_register_statistics (zh,1);
}
else if (!strcmp (arg, "compact"))
{
- rval = res_get (common_resource, "shadow");
- zebraIndexLock (rGroupDef.bfs, 0, rval);
- if (rval && *rval)
- {
- bf_cache (rGroupDef.bfs, rval);
- zebraIndexLockMsg ("r");
- }
- inv_compact(rGroupDef.bfs);
+ zebra_compact (zh);
}
else
{
}
else
{
- struct recordGroup rGroup;
-#if ZMBOL
-#else
- /* For zebra, delete lock file and reset register */
- if (rGroupDef.flagRw)
- {
- zebraIndexUnlock();
- bf_reset (rGroupDef.bfs);
- }
-#endif
- rval = res_get (common_resource, "shadow");
- zebraIndexLock (rGroupDef.bfs, 0, rval);
- if (rGroupDef.flagRw)
+ rGroupDef.path = arg;
+ zebra_set_group (zh, &rGroupDef);
+ if (!trans_started)
{
- if (rval && *rval && !disableCommit)
- {
- bf_cache (rGroupDef.bfs, rval);
- zebraIndexLockMsg ("r");
- }
- else
- {
- bf_cache (rGroupDef.bfs, 0);
- zebraIndexLockMsg ("w");
- }
- zebraIndexWait (0);
+ trans_started=1;
+ zebra_begin_trans (zh);
}
- memcpy (&rGroup, &rGroupDef, sizeof(rGroup));
- rGroup.path = arg;
+
switch (cmd)
{
case 'u':
- if (!key_open (&rGroup, mem_max))
- {
- logf (LOG_LOG, "updating %s", rGroup.path);
- repositoryUpdate (&rGroup);
- nsections = key_close (&rGroup);
- }
- break;
- case 'U':
- if (!key_open (&rGroup, mem_max))
- {
- logf (LOG_LOG, "updating (pass 1) %s", rGroup.path);
- repositoryUpdate (&rGroup);
- key_close (&rGroup);
- }
- nsections = 0;
+ zebra_repository_update (zh);
break;
case 'd':
- if (!key_open (&rGroup,mem_max))
- {
- logf (LOG_LOG, "deleting %s", rGroup.path);
- repositoryDelete (&rGroup);
- nsections = key_close (&rGroup);
- }
+ zebra_repository_delete (zh);
break;
case 's':
- logf (LOG_LOG, "dumping %s", rGroup.path);
- repositoryShow (&rGroup);
+ logf (LOG_LOG, "dumping %s", rGroupDef.path);
+ zebra_repository_show (zh);
nsections = 0;
break;
- case 'm':
- nsections = -1;
- break;
default:
nsections = 0;
}
- cmd = 0;
- if (nsections)
- {
- logf (LOG_LOG, "merging with index");
- key_input (rGroup.bfs, nsections, 60, common_resource);
-#ifndef WIN32
- sync ();
-#endif
- }
log_event_end (NULL, NULL);
}
}
else if (ret == 'V')
{
-#if ZMBOL
- fprintf (stderr, "Z'mbol %s %s\n", ZEBRAVER, ZEBRADATE);
-#else
- fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
-#endif
- fprintf (stderr, " (C) 1994-2001, Index Data ApS\n");
+ printf("Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
+ printf(" (C) 1994-2002, Index Data ApS\n");
#ifdef WIN32
#ifdef _DEBUG
- fprintf (stderr, " WIN32 Debug\n");
+ printf(" WIN32 Debug\n");
#else
- fprintf (stderr, " WIN32 Release\n");
+ printf(" WIN32 Release\n");
#endif
#endif
#if HAVE_BZLIB_H
- fprintf (stderr, "libbzip2\n"
- " (C) 1996-1999 Julian R Seward. All rights reserved.\n");
+ printf("libbzip2\n"
+ " (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 = 1024*1024*atoi(arg);
+ mem_max = arg;
else if (ret == 'd')
rGroupDef.databaseName = arg;
else if (ret == 's')
rGroupDef.recordType = arg;
else if (ret == 'n')
disableCommit = 1;
-#if ZEBRASDR
- else if (ret == 'S')
- rGroupDef.useSDR = 1;
-#endif
+ else if (ret == 'L')
+ rGroupDef.followLinks = 0;
else
logf (LOG_WARN, "unknown option '-%s'", arg);
- }
- recTypes_destroy (rGroupDef.recTypes);
- if (common_resource)
+ } /* while arg */
+
+ if (trans_started)
+ zebra_end_trans (zh);
+
+ zebra_close (zh);
+ zebra_stop (zs);
+#if HAVE_SYS_TIMES_H
+ if (trans_started)
{
- zebraIndexUnlock ();
- bfs_destroy (rGroupDef.bfs);
+ gettimeofday(&end_time, 0);
+ usec = (end_time.tv_sec - start_time.tv_sec) * 1000000L +
+ 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,
+ (double) (tms2.tms_utime - tms1.tms_utime)/100,
+ (double) (tms2.tms_stime - tms1.tms_stime)/100);
}
- data1_destroy (rGroupDef.dh);
+#endif
exit (0);
return 0;
}
projects / idzebra-moved-to-github.git / blobdiff