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
Many public functions returns ZEBRA_RES rather than int to avoid
[idzebra-moved-to-github.git]
/
index
/
main.c
diff --git
a/index/main.c
b/index/main.c
index
47838a1
..
c435b21
100644
(file)
--- a/
index/main.c
+++ b/
index/main.c
@@
-1,6
+1,6
@@
-/* $Id: main.c,v 1.119 2004-12-13 20:51:30 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: main.c,v 1.123 2005-01-21 13:23:25 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.
@@
-21,6
+21,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
*/
#include <stdio.h>
*/
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <assert.h>
#ifdef WIN32
#include <string.h>
#include <assert.h>
#ifdef WIN32
@@
-58,7
+59,7
@@
int main (int argc, char **argv)
char *configName = 0;
int nsections = 0;
int enable_commit = 1;
char *configName = 0;
int nsections = 0;
int enable_commit = 1;
- char *database = "Default";
+ char *database = 0;
Res res = res_open(0, 0, 0);
int trans_started=0;
Res res = res_open(0, 0, 0);
int trans_started=0;
@@
-77,7
+78,7
@@
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
yaz_log_init_prefix (nbuf);
#endif
#if HAVE_SYS_TIMES_H
@@
-134,10
+135,10
@@
int main (int argc, char **argv)
zebra_shadow_enable (zh, enable_commit);
}
zebra_shadow_enable (zh, enable_commit);
}
- if (zebra_select_database (zh, database))
+ if (database && zebra_select_database (zh, database))
{
yaz_log(YLOG_FATAL, "Could not select database %s errCode=%d",
{
yaz_log(YLOG_FATAL, "Could not select database %s errCode=%d",
- database, zebra_errCode(zh) );
+ database, zebra_errCode(zh) );
exit (1);
}
if (!strcmp (arg, "update"))
exit (1);
}
if (!strcmp (arg, "update"))
@@
-227,7
+228,7
@@
int main (int argc, char **argv)
else if (ret == 'V')
{
printf("Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
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");