X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=123887afe34873793b5f0be5ca567a76f37a120f;hb=73d50b4eee5d1af8aae0ba0f0e7fed7ebad2dd51;hp=eb4533b685f6a4d9d6c7511c43115f0c8ae39e29;hpb=3d01abbe1238c82d62e4c01eb7cac760d3d53377;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index eb4533b..123887a 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,23 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1998, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.51 1997-10-27 14:33:05 adam + * Revision 1.55 1998-01-26 10:37:34 adam + * Minor changes. + * + * Revision 1.54 1998/01/12 15:04:08 adam + * The test option (-s) only uses read-lock (and not write lock). + * + * Revision 1.53 1997/11/18 10:05:08 adam + * Changed character map facility so that admin can specify character + * mapping files for each register type, w, p, etc. + * + * Revision 1.52 1997/10/31 12:34:04 adam + * Added missing nmem_init. + * + * Revision 1.51 1997/10/27 14:33:05 adam * Moved towards generic character mapping depending on "structure" * field in abstract syntax file. Fixed a few memory leaks. Fixed * bug with negative integers when doing searches with relational @@ -201,18 +214,12 @@ #include #include "index.h" +#include "recindex.h" char *prog; -size_t mem_max = 0; Res common_resource = 0; -static void abort_func (int level, const char *msg, void *info) -{ - if (level & LOG_FATAL) - abort (); -} - int main (int argc, char **argv) { int ret; @@ -221,9 +228,12 @@ int main (int argc, char **argv) char *configName = NULL; int nsections; int disableCommit = 0; + size_t mem_max = 0; struct recordGroup rGroupDef; - + + nmem_init (); + rGroupDef.groupName = NULL; rGroupDef.databaseName = NULL; rGroupDef.path = NULL; @@ -231,7 +241,7 @@ int main (int argc, char **argv) rGroupDef.recordType = NULL; rGroupDef.flagStoreData = -1; rGroupDef.flagStoreKeys = -1; - rGroupDef.flagShowRecords = 0; + rGroupDef.flagRw = 1; rGroupDef.fileVerboseLimit = 100000; rGroupDef.zebra_maps = NULL; rGroupDef.dh = data1_create (); @@ -275,7 +285,7 @@ int main (int argc, char **argv) configName : FNAME_CONFIG); if (!common_resource) { - logf (LOG_FATAL, "cannot open resource `%s'", + logf (LOG_FATAL, "cannot configuration file `%s'", configName); exit (1); } @@ -288,7 +298,7 @@ int main (int argc, char **argv) bf_lockDir (rGroupDef.bfs, res_get (common_resource, "lockDir")); rGroupDef.zebra_maps = zebra_maps_open (res_get( - common_resource, "profilePath")); + common_resource, "profilePath"), common_resource); } if (!strcmp (arg, "update")) cmd = 'u'; @@ -346,6 +356,7 @@ int main (int argc, char **argv) } else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) { + Records records; rval = res_get (common_resource, "shadow"); zebraIndexLock (rGroupDef.bfs, 0, rval); if (rval && *rval) @@ -353,7 +364,9 @@ int main (int argc, char **argv) bf_cache (rGroupDef.bfs, rval); zebraIndexLockMsg ("r"); } - rec_prstat (); + records = rec_open (rGroupDef.bfs, 0); + rec_prstat (records); + rec_close (&records); inv_prstat (rGroupDef.bfs); } else @@ -362,47 +375,54 @@ int main (int argc, char **argv) exit (1); } } - else + else { struct recordGroup rGroup; - log_event_end (abort_func, NULL); rval = res_get (common_resource, "shadow"); zebraIndexLock (rGroupDef.bfs, 0, rval); - if (rval && *rval && !disableCommit) - { - bf_cache (rGroupDef.bfs, rval); - zebraIndexLockMsg ("r"); - } - else - { - bf_cache (rGroupDef.bfs, 0); - zebraIndexLockMsg ("w"); - } - zebraIndexWait (0); - + if (rGroupDef.flagRw) + { + if (rval && *rval && !disableCommit) + { + bf_cache (rGroupDef.bfs, rval); + zebraIndexLockMsg ("r"); + } + else + { + bf_cache (rGroupDef.bfs, 0); + zebraIndexLockMsg ("w"); + } + zebraIndexWait (0); + } memcpy (&rGroup, &rGroupDef, sizeof(rGroup)); rGroup.path = arg; switch (cmd) { case 'u': - key_open (rGroup.bfs, mem_max); - logf (LOG_LOG, "updating %s", rGroup.path); - repositoryUpdate (&rGroup); - nsections = key_close (); + if (!key_open (rGroup.bfs, mem_max, rGroup.flagRw)) + { + logf (LOG_LOG, "updating %s", rGroup.path); + repositoryUpdate (&rGroup); + nsections = key_close (); + } break; case 'U': - key_open (rGroup.bfs,mem_max); - logf (LOG_LOG, "updating (pass 1) %s", rGroup.path); - repositoryUpdate (&rGroup); - key_close (); + if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw)) + { + logf (LOG_LOG, "updating (pass 1) %s", rGroup.path); + repositoryUpdate (&rGroup); + key_close (); + } nsections = 0; break; case 'd': - key_open (rGroup.bfs,mem_max); - logf (LOG_LOG, "deleting %s", rGroup.path); - repositoryDelete (&rGroup); - nsections = key_close (); + if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw)) + { + logf (LOG_LOG, "deleting %s", rGroup.path); + repositoryDelete (&rGroup); + nsections = key_close (); + } break; case 's': logf (LOG_LOG, "dumping %s", rGroup.path); @@ -438,7 +458,7 @@ int main (int argc, char **argv) else if (ret == 'd') rGroupDef.databaseName = arg; else if (ret == 's') - rGroupDef.flagShowRecords = 1; + rGroupDef.flagRw = 0; else if (ret == 'g') rGroupDef.groupName = arg; else if (ret == 'f') @@ -450,10 +470,7 @@ int main (int argc, char **argv) else if (ret == 'n') disableCommit = 1; else - { - logf (LOG_FATAL, "unknown option '-%s'", arg); - exit (1); - } + logf (LOG_WARN, "unknown option '-%s'", arg); } if (common_resource) { @@ -462,5 +479,6 @@ int main (int argc, char **argv) } data1_destroy (rGroupDef.dh); exit (0); + return 0; }