X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=d238bb9559c416276bd4326fd0dc5b80ee2cca4e;hb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;hp=dcb89a64273dc11eee99097418f6ae89e031cfe1;hpb=45554249f7785e31125a062dc410a93ef693f574;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index dcb89a6..d238bb9 100644 --- a/index/main.c +++ b/index/main.c @@ -4,7 +4,24 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.44 1996-10-29 14:09:48 adam + * Revision 1.48 1997-09-09 13:38:08 adam + * Partial port to WIN95/NT. + * + * Revision 1.47 1997/02/12 20:39:46 adam + * Implemented options -f that limits the log to the first + * records. + * Changed some log messages also. + * + * Revision 1.46 1997/02/10 10:20:13 adam + * Flag fileVerboseFlag set to 0 (default). + * + * Revision 1.45 1996/11/08 11:10:26 adam + * Buffers used during file match got bigger. + * Compressed ISAM support everywhere. + * Bug fixes regarding masking characters in queries. + * Redesigned Regexp-2 queries. + * + * Revision 1.44 1996/10/29 14:09:48 adam * Use of cisam system - enabled if setting isamc is 1. * * Revision 1.43 1996/06/06 12:08:42 quinn @@ -163,7 +180,11 @@ */ #include #include +#ifdef WINDOWS +#include +#else #include +#endif #include #include "index.h" @@ -196,7 +217,7 @@ int main (int argc, char **argv) rGroupDef.flagStoreData = -1; rGroupDef.flagStoreKeys = -1; rGroupDef.flagShowRecords = 0; - rGroupDef.fileVerboseFlag = 1; + rGroupDef.fileVerboseLimit = 100000; prog = *argv; if (argc < 2) @@ -214,15 +235,15 @@ int main (int argc, char **argv) " -g Index files according to group settings.\n" " -d Records belong to Z39.50 database .\n" " -m Use before flushing keys to disk.\n" - " -n Don't use shadow system\n" - " -s Show analysis on stdout, but do no work\n" - " -v Set logging to \n" - " -V Show version\n" + " -n Don't use shadow system.\n" + " -s Show analysis on stdout, but do no work.\n" + " -v Set logging to .\n" + " -f Display information for the first records.\n" + " -V Show version.\n" ); exit (1); } - log_event_end (abort_func, NULL); - while ((ret = options ("sVt:c:g:d:m:v:n", argv, argc, &arg)) != -2) + while ((ret = options ("sVt:c:g:d:m:v:nf:", argv, argc, &arg)) != -2) { if (ret == 0) { @@ -231,11 +252,13 @@ int main (int argc, char **argv) { if (!common_resource) { + logf (LOG_LOG, "zebra version %s %s", + ZEBRAVER, ZEBRADATE); common_resource = res_open (configName ? configName : FNAME_CONFIG); if (!common_resource) { - logf (LOG_FATAL, "Cannot open resource `%s'", + logf (LOG_FATAL, "cannot open resource `%s'", configName); exit (1); } @@ -268,19 +291,19 @@ int main (int argc, char **argv) } if (bf_commitExists ()) { - logf (LOG_LOG, "Commit start"); + logf (LOG_LOG, "commit start"); zebraIndexLockMsg ("c"); zebraIndexWait (1); - logf (LOG_LOG, "Commit execute"); + logf (LOG_LOG, "commit execute"); bf_commitExec (); sync (); zebraIndexLockMsg ("d"); zebraIndexWait (0); - logf (LOG_LOG, "Commit clean"); + logf (LOG_LOG, "commit clean"); bf_commitClean (); } else - logf (LOG_LOG, "Nothing to commit"); + logf (LOG_LOG, "cothing to commit"); } else if (!strcmp (arg, "clean")) { @@ -289,11 +312,11 @@ int main (int argc, char **argv) { zebraIndexLockMsg ("d"); zebraIndexWait (0); - logf (LOG_LOG, "Commit clean"); + logf (LOG_LOG, "commit clean"); bf_commitClean (); } else - logf (LOG_LOG, "Nothing to clean"); + logf (LOG_LOG, "nothing to clean"); } else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) { @@ -305,11 +328,11 @@ int main (int argc, char **argv) zebraIndexLockMsg ("r"); } rec_prstat (); - inv_prstat (FNAME_DICT, FNAME_ISAM); + inv_prstat (); } else { - logf (LOG_FATAL, "Unknown command: %s", arg); + logf (LOG_FATAL, "unknown command: %s", arg); exit (1); } } @@ -317,6 +340,7 @@ int main (int argc, char **argv) { struct recordGroup rGroup; + log_event_end (abort_func, NULL); zebraIndexLock (0); rval = res_get (common_resource, "shadow"); if (rval && *rval && !disableCommit) @@ -337,25 +361,25 @@ int main (int argc, char **argv) { case 'u': key_open (mem_max); - logf (LOG_LOG, "Updating %s", rGroup.path); + logf (LOG_LOG, "updating %s", rGroup.path); repositoryUpdate (&rGroup); nsections = key_close (); break; case 'U': key_open (mem_max); - logf (LOG_LOG, "Updating (pass 1) %s", rGroup.path); + logf (LOG_LOG, "updating (pass 1) %s", rGroup.path); repositoryUpdate (&rGroup); key_close (); nsections = 0; break; case 'd': key_open (mem_max); - logf (LOG_LOG, "Deleting %s", rGroup.path); + logf (LOG_LOG, "deleting %s", rGroup.path); repositoryDelete (&rGroup); nsections = key_close (); break; case 's': - logf (LOG_LOG, "Dumping %s", rGroup.path); + logf (LOG_LOG, "dumping %s", rGroup.path); repositoryShow (&rGroup); nsections = 0; break; @@ -368,37 +392,29 @@ int main (int argc, char **argv) cmd = 0; if (nsections) { - logf (LOG_LOG, "Merging with index"); + logf (LOG_LOG, "merging with index"); key_input (nsections, 60); sync (); } + log_event_end (NULL, NULL); } } else if (ret == 'V') { - fprintf (stderr, "Zebra %s %s\n", - ZEBRAVER, ZEBRADATE); + fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE); } else if (ret == 'v') - { log_init (log_mask_str(arg), prog, NULL); - } else if (ret == 'm') - { mem_max = 1024*1024*atoi(arg); - } else if (ret == 'd') - { rGroupDef.databaseName = arg; - } else if (ret == 's') - { rGroupDef.flagShowRecords = 1; - } else if (ret == 'g') - { rGroupDef.groupName = arg; - } + else if (ret == 'f') + rGroupDef.fileVerboseLimit = atoi(arg); else if (ret == 'c') configName = arg; else if (ret == 't') @@ -407,7 +423,7 @@ int main (int argc, char **argv) disableCommit = 1; else { - logf (LOG_FATAL, "Unknown option '-%s'", arg); + logf (LOG_FATAL, "unknown option '-%s'", arg); exit (1); } }