X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=5d220254118102be271c4fbe486cad9913b3ef67;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hp=f5073a1579e500579d07159fcf7fdc42560e7a1a;hpb=d66990c38540b6196ede05d4b5636a9b51609134;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index f5073a1..5d22025 100644 --- a/index/main.c +++ b/index/main.c @@ -1,6 +1,6 @@ -/* $Id: main.c,v 1.108 2003-11-24 12:58:00 mike Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 - 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,19 +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 @@ -35,18 +38,21 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #endif -#if HAVE_TCL_H -#include -#endif +#include +#include +#include -#if HAVE_EXPAT_H -#include -#endif +char *prog; -#include -#include "zebraapi.h" +static void filter_cb(void *cd, const char *name) +{ + puts (name); +} -char *prog; +static void show_filters(ZebraService zs) +{ + zebra_filter_info(zs, 0, filter_cb); +} int main (int argc, char **argv) { @@ -55,19 +61,21 @@ int main (int argc, char **argv) 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); 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 - struct recordGroup rGroupDef; ZebraService zs = 0; ZebraHandle zh = 0; @@ -75,27 +83,15 @@ 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 - - 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) { @@ -124,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) { @@ -134,40 +129,24 @@ int main (int argc, char **argv) if (!zs) { const char *config = configName ? configName : "zebra.cfg"; - logf (LOG_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); + zh = zebra_open (zs, 0); + zebra_shadow_enable (zh, enable_commit); } - 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 (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")) @@ -210,51 +189,58 @@ int main (int argc, char **argv) { 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; - if (zebra_begin_trans (zh, 1)) + 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': - zebra_create_database(zh, rGroupDef.path); + res = zebra_create_database(zh, arg); break; case 'D': - zebra_drop_database(zh, rGroupDef.path); + 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-2003, Index Data ApS\n"); + printf(" (C) 1994-2006, Index Data ApS\n"); #ifdef WIN32 #ifdef _DEBUG printf(" WIN32 Debug\n"); @@ -265,64 +251,64 @@ 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_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 == '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_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); 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 +#endif nmem_exit(); exit (0); return 0; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +