X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=5d220254118102be271c4fbe486cad9913b3ef67;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hp=b8ad1fb38c606b2cb59636ca10e7e523114462b9;hpb=5437b50633032595afe6f87dc0f989bc92a5aea8;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index b8ad1fb..5d22025 100644 --- a/index/main.c +++ b/index/main.c @@ -1,6 +1,6 @@ -/* $Id: main.c,v 1.118 2004-11-19 10:27:00 heikki Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps +/* $Id: main.c,v 1.130 2006-08-14 10:40:15 adam Exp $ + Copyright (C) 1995-2006 + Index Data ApS This file is part of the Zebra server. @@ -15,18 +15,22 @@ 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. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ #include +#include #include #include #ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include +#endif +#if HAVE_SYS_TIME_H #include #endif #include @@ -34,7 +38,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #endif -#include +#include #include #include @@ -58,15 +62,17 @@ int main (int argc, char **argv) char *configName = 0; int nsections = 0; int enable_commit = 1; - char *database = "Default"; - Res res = res_open(0, 0, 0); + char *database = 0; + Res res = res_open(0, 0); int trans_started=0; #if HAVE_SYS_TIMES_H struct tms tms1, tms2; - struct timeval start_time, end_time; double usec; #endif +#if HAVE_SYS_TIME_H + struct timeval start_time, end_time; +#endif #ifndef WIN32 char nbuf[100]; #endif @@ -77,11 +83,13 @@ int main (int argc, char **argv) #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 prog = *argv; @@ -112,8 +120,7 @@ int main (int argc, char **argv) ); 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) { @@ -122,22 +129,22 @@ int main (int argc, char **argv) if (!zs) { const char *config = configName ? configName : "zebra.cfg"; - yaz_log (YLOG_LOG, "Zebra version %s %s", - ZEBRAVER, ZEBRADATE); zs = zebra_start_res (config, 0, res); if (!zs) { yaz_log (YLOG_FATAL, "Cannot read config %s", config); exit (1); } - zh = zebra_open (zs); + 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) { - yaz_log(YLOG_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")) @@ -194,40 +201,46 @@ int main (int argc, char **argv) } else { + ZEBRA_RES res = ZEBRA_OK; 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': - zebra_repository_update (zh, arg); + res = zebra_repository_update (zh, arg); break; case 'd': - zebra_repository_delete (zh, arg); + res = zebra_repository_delete (zh, arg); break; case 's': - zebra_repository_show (zh, arg); + res = zebra_repository_show (zh, arg); nsections = 0; break; case 'C': - zebra_create_database(zh, arg); + res = zebra_create_database(zh, arg); break; case 'D': - zebra_drop_database(zh, arg); + 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-2004, Index Data ApS\n"); + printf(" (C) 1994-2006, Index Data ApS\n"); #ifdef WIN32 #ifdef _DEBUG printf(" WIN32 Debug\n"); @@ -266,11 +279,13 @@ int main (int argc, char **argv) } /* 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 +#if HAVE_SYS_TIME_H if (trans_started) { gettimeofday(&end_time, 0); @@ -283,8 +298,17 @@ int main (int argc, char **argv) (double) (tms2.tms_stime - tms1.tms_stime)/100); } #endif +#endif nmem_exit(); exit (0); return 0; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +