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
Fix the way we delete the shadow files after a "succesful" commit
[idzebra-moved-to-github.git]
/
index
/
main.c
diff --git
a/index/main.c
b/index/main.c
index
83a4c7b
..
ae942ed
100644
(file)
--- a/
index/main.c
+++ b/
index/main.c
@@
-1,6
+1,6
@@
-/* $Id: main.c,v 1.113 2004-08-25 09:23:36 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: main.c,v 1.128 2006-03-31 15:58:04 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-20,14
+20,17
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-
#include <stdio.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <assert.h>
#ifdef WIN32
#include <io.h>
#include <string.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>
@@
-35,19
+38,22
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <sys/times.h>
#endif
#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 <yaz/log.h>
+#include <yaz/options.h>
#include <idzebra/api.h>
char *prog;
#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;
int main (int argc, char **argv)
{
int ret;
@@
-55,16
+61,18
@@
int main (int argc, char **argv)
char *arg;
char *configName = 0;
int nsections = 0;
char *arg;
char *configName = 0;
int nsections = 0;
- int disableCommit = 0;
- char *database = "Default";
- Res res = res_open(0, 0, 0);
+ int enable_commit = 1;
+ char *database = 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
@@
-75,11
+83,13
@@
int main (int argc, char **argv)
#ifdef WIN32
#else
#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);
yaz_log_init_prefix (nbuf);
#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;
@@
-110,8
+120,7
@@
int main (int argc, char **argv)
);
exit (1);
}
);
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 (ret == 0)
{
@@
-120,23
+129,22
@@
int main (int argc, char **argv)
if (!zs)
{
const char *config = configName ? configName : "zebra.cfg";
if (!zs)
{
const char *config = configName ? configName : "zebra.cfg";
- logf (LOG_LOG, "Zebra version %s %s",
- ZEBRAVER, ZEBRADATE);
zs = zebra_start_res (config, 0, res);
if (!zs)
{
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);
}
exit (1);
}
- zh = zebra_open (zs);
- if (disableCommit)
- zebra_shadow_enable (zh, 0);
+ zh = zebra_open (zs, 0);
+ zebra_shadow_enable (zh, enable_commit);
}
}
- if (zebra_select_database (zh, database))
+ if (database &&
+ zebra_select_database (zh, database) == ZEBRA_FAIL)
{
{
- logf(LOG_FATAL, "Could not select database %s errCode=%d",
- database, zebra_errCode(zh) );
+ yaz_log(YLOG_FATAL, "Could not select database %s "
+ "errCode=%d",
+ database, zebra_errCode(zh) );
exit (1);
}
if (!strcmp (arg, "update"))
exit (1);
}
if (!strcmp (arg, "update"))
@@
-181,48
+189,58
@@
int main (int argc, char **argv)
{
zebra_compact (zh);
}
{
zebra_compact (zh);
}
+ else if (!strcmp (arg, "filters"))
+ {
+ show_filters(zs);
+ }
else
{
else
{
- logf (LOG_FATAL, "unknown command: %s", arg);
+ yaz_log (YLOG_FATAL, "unknown command: %s", arg);
exit (1);
}
}
else
{
exit (1);
}
}
else
{
+ ZEBRA_RES res = ZEBRA_OK;
if (!trans_started)
{
trans_started=1;
if (!trans_started)
{
trans_started=1;
- if (zebra_begin_trans (zh, 1))
+ if (zebra_begin_trans (zh, 1) != ZEBRA_OK)
exit(1);
}
switch (cmd)
{
case 'u':
exit(1);
}
switch (cmd)
{
case 'u':
- zebra_repository_update (zh, arg);
+ res = zebra_repository_update (zh, arg);
break;
case 'd':
break;
case 'd':
- zebra_repository_delete (zh, arg);
+ res = zebra_repository_delete (zh, arg);
break;
case 's':
break;
case 's':
- zebra_repository_show (zh, arg);
+ res = zebra_repository_show (zh, arg);
nsections = 0;
break;
case 'C':
nsections = 0;
break;
case 'C':
- zebra_create_database(zh, arg);
+ res = zebra_create_database(zh, arg);
break;
case 'D':
break;
case 'D':
- zebra_drop_database(zh, arg);
+ res = zebra_drop_database(zh, arg);
break;
default:
nsections = 0;
}
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);
log_event_end (NULL, NULL);
}
}
else if (ret == 'V')
{
printf("Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
- printf(" (C) 1994-2004, Index Data ApS\n");
+ printf(" (C) 1994-2005, Index Data ApS\n");
#ifdef WIN32
#ifdef _DEBUG
printf(" WIN32 Debug\n");
#ifdef WIN32
#ifdef _DEBUG
printf(" WIN32 Debug\n");
@@
-233,17
+251,6
@@
int main (int argc, char **argv)
#if HAVE_BZLIB_H
printf("Using: libbzip2, (C) 1996-1999 Julian R Seward. All rights reserved.\n");
#endif
#if HAVE_BZLIB_H
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')
yaz_log_init_level (yaz_log_mask_str(arg));
}
else if (ret == 'v')
yaz_log_init_level (yaz_log_mask_str(arg));
@@
-264,31
+271,34
@@
int main (int argc, char **argv)
else if (ret == 't')
res_set(res, "recordType", arg);
else if (ret == 'n')
else if (ret == 't')
res_set(res, "recordType", arg);
else if (ret == 'n')
- res_set(res, "disableCommit", "1");
- else if (ret == 'L')
+ enable_commit = 0;
+ else if (ret == 'L')
res_set(res, "followLinks", "0");
else
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)
} /* 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);
usec = (end_time.tv_sec - start_time.tv_sec) * 1000000.0 +
end_time.tv_usec - start_time.tv_usec;
times(&tms2);
if (trans_started)
{
gettimeofday(&end_time, 0);
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",
+ 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
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;
nmem_exit();
exit (0);
return 0;