X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=97ac380aa327d0d4e0a92ec9d8896c526d701470;hb=e19bd45069a282b054015f9cf88e109968b9fa7f;hp=4991924fe9ed44fdea73d2c17345787380d90b26;hpb=b9093505b17a074e79137ed64595c8269f77d330;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index 4991924..97ac380 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,51 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1998, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.49 1997-09-17 12:19:15 adam + * Revision 1.60 1998-10-28 10:54:39 adam + * SDRKit integration. + * + * Revision 1.59 1998/10/16 08:14:32 adam + * Updated record control system. + * + * Revision 1.58 1998/06/08 14:43:13 adam + * Added suport for EXPLAIN Proxy servers - added settings databasePath + * and explainDatabase to facilitate this. Increased maximum number + * of databases and attributes in one register. + * + * Revision 1.57 1998/05/20 10:12:18 adam + * Implemented automatic EXPLAIN database maintenance. + * Modified Zebra to work with ASN.1 compiled version of YAZ. + * + * Revision 1.56 1998/03/05 08:45:12 adam + * New result set model and modular ranking system. Moved towards + * descent server API. System information stored as "SGML" records. + * + * 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 + * operators. + * + * Revision 1.50 1997/09/25 14:55:52 adam + * Minor changes. + * + * Revision 1.49 1997/09/17 12:19:15 adam * Zebra version corresponds to YAZ version 1.4. * Changed Zebra server so that it doesn't depend on global common_resource. * @@ -192,18 +233,20 @@ #include #include "index.h" +#include "recindex.h" + +#ifndef ZEBRASDR +#define ZEBRASDR 0 +#endif + +#if ZEBRASDR +#include "zebrasdr.h" +#endif 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; @@ -212,9 +255,15 @@ int main (int argc, char **argv) char *configName = NULL; int nsections; int disableCommit = 0; + size_t mem_max = 0; struct recordGroup rGroupDef; - + + nmem_init (); + +#if ZEBRASDR + zebraSdr_std (); +#endif rGroupDef.groupName = NULL; rGroupDef.databaseName = NULL; rGroupDef.path = NULL; @@ -222,9 +271,14 @@ int main (int argc, char **argv) rGroupDef.recordType = NULL; rGroupDef.flagStoreData = -1; rGroupDef.flagStoreKeys = -1; - rGroupDef.flagShowRecords = 0; + rGroupDef.flagRw = 1; + rGroupDef.databaseNamePath = 0; + rGroupDef.explainDatabase = 0; rGroupDef.fileVerboseLimit = 100000; + rGroupDef.zebra_maps = NULL; rGroupDef.dh = data1_create (); + rGroupDef.recTypes = recTypes_init (rGroupDef.dh); + recTypes_default_handlers (rGroupDef.recTypes); prog = *argv; if (argc < 2) @@ -250,7 +304,7 @@ int main (int argc, char **argv) ); exit (1); } - while ((ret = options ("sVt:c:g:d:m:v:nf:", argv, argc, &arg)) != -2) + while ((ret = options ("sVt:c:g:d:m:v:nf:l:", argv, argc, &arg)) != -2) { if (ret == 0) { @@ -265,7 +319,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); } @@ -277,7 +331,7 @@ int main (int argc, char **argv) bf_lockDir (rGroupDef.bfs, res_get (common_resource, "lockDir")); - init_charmap(common_resource); + rGroupDef.zebra_maps = zebra_maps_open (common_resource); } if (!strcmp (arg, "update")) cmd = 'u'; @@ -308,7 +362,9 @@ int main (int argc, char **argv) zebraIndexWait (1); logf (LOG_LOG, "commit execute"); bf_commitExec (rGroupDef.bfs); +#ifndef WINDOWS sync (); +#endif zebraIndexLockMsg ("d"); zebraIndexWait (0); logf (LOG_LOG, "commit clean"); @@ -333,6 +389,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) @@ -340,7 +397,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 @@ -349,47 +408,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, mem_max)) + { + logf (LOG_LOG, "updating %s", rGroup.path); + repositoryUpdate (&rGroup); + nsections = key_close (&rGroup); + } 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, mem_max)) + { + logf (LOG_LOG, "updating (pass 1) %s", rGroup.path); + repositoryUpdate (&rGroup); + key_close (&rGroup); + } 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,mem_max)) + { + logf (LOG_LOG, "deleting %s", rGroup.path); + repositoryDelete (&rGroup); + nsections = key_close (&rGroup); + } break; case 's': logf (LOG_LOG, "dumping %s", rGroup.path); @@ -407,7 +473,9 @@ int main (int argc, char **argv) { logf (LOG_LOG, "merging with index"); key_input (rGroup.bfs, nsections, 60); +#ifndef WINDOWS sync (); +#endif } log_event_end (NULL, NULL); } @@ -417,13 +485,15 @@ int main (int argc, char **argv) fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE); } else if (ret == 'v') - log_init (log_mask_str(arg), prog, NULL); + log_init_level (log_mask_str(arg)); + else if (ret == 'l') + log_init_file (arg); else if (ret == 'm') mem_max = 1024*1024*atoi(arg); 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') @@ -435,10 +505,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) { @@ -447,5 +514,6 @@ int main (int argc, char **argv) } data1_destroy (rGroupDef.dh); exit (0); + return 0; }