X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=5add43eaa15f64f664d4b74c0b8c0ea4ab2347ae;hb=eaa8c71186392f0d2a1ab714dc6f3f0a4da71d03;hp=d238bb9559c416276bd4326fd0dc5b80ee2cca4e;hpb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;p=idzebra-moved-to-github.git diff --git a/index/main.c b/index/main.c index d238bb9..5add43e 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,26 @@ /* - * Copyright (C) 1994-1996, Index Data I/S + * Copyright (C) 1994-1997, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: main.c,v $ - * Revision 1.48 1997-09-09 13:38:08 adam + * 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. + * + * 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 @@ -192,6 +208,8 @@ 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) @@ -208,7 +226,9 @@ int main (int argc, char **argv) int disableCommit = 0; struct recordGroup rGroupDef; - + + nmem_init (); + rGroupDef.groupName = NULL; rGroupDef.databaseName = NULL; rGroupDef.path = NULL; @@ -218,6 +238,8 @@ int main (int argc, char **argv) rGroupDef.flagStoreKeys = -1; rGroupDef.flagShowRecords = 0; rGroupDef.fileVerboseLimit = 100000; + rGroupDef.zebra_maps = NULL; + rGroupDef.dh = data1_create (); prog = *argv; if (argc < 2) @@ -262,10 +284,16 @@ int main (int argc, char **argv) configName); exit (1); } - data1_set_tabpath (res_get (common_resource, - "profilePath")); - bf_lockDir (res_get (common_resource, "lockDir")); - init_charmap(); + data1_set_tabpath (rGroupDef.dh, res_get (common_resource, + "profilePath")); + + rGroupDef.bfs = + bfs_create (res_get (common_resource, "register")); + + bf_lockDir (rGroupDef.bfs, + res_get (common_resource, "lockDir")); + rGroupDef.zebra_maps = zebra_maps_open (res_get( + common_resource, "profilePath")); } if (!strcmp (arg, "update")) cmd = 'u'; @@ -279,56 +307,59 @@ int main (int argc, char **argv) cmd = 'd'; else if (!strcmp (arg, "commit")) { - zebraIndexLock (1); rval = res_get (common_resource, "shadow"); + zebraIndexLock (rGroupDef.bfs, 1, rval); if (rval && *rval) - bf_cache (1); + bf_cache (rGroupDef.bfs, rval); else { logf (LOG_FATAL, "Cannot perform commit"); logf (LOG_FATAL, "No shadow area defined"); exit (1); } - if (bf_commitExists ()) + if (bf_commitExists (rGroupDef.bfs)) { logf (LOG_LOG, "commit start"); zebraIndexLockMsg ("c"); zebraIndexWait (1); logf (LOG_LOG, "commit execute"); - bf_commitExec (); + bf_commitExec (rGroupDef.bfs); +#ifndef WINDOWS sync (); +#endif zebraIndexLockMsg ("d"); zebraIndexWait (0); logf (LOG_LOG, "commit clean"); - bf_commitClean (); + bf_commitClean (rGroupDef.bfs, rval); } else logf (LOG_LOG, "cothing to commit"); } else if (!strcmp (arg, "clean")) { - zebraIndexLock (1); - if (bf_commitExists ()) + rval = res_get (common_resource, "shadow"); + zebraIndexLock (rGroupDef.bfs, 1, rval); + if (bf_commitExists (rGroupDef.bfs)) { zebraIndexLockMsg ("d"); zebraIndexWait (0); logf (LOG_LOG, "commit clean"); - bf_commitClean (); + bf_commitClean (rGroupDef.bfs, rval); } else logf (LOG_LOG, "nothing to clean"); } else if (!strcmp (arg, "stat") || !strcmp (arg, "status")) { - zebraIndexLock (0); rval = res_get (common_resource, "shadow"); + zebraIndexLock (rGroupDef.bfs, 0, rval); if (rval && *rval) { - bf_cache (1); + bf_cache (rGroupDef.bfs, rval); zebraIndexLockMsg ("r"); } rec_prstat (); - inv_prstat (); + inv_prstat (rGroupDef.bfs); } else { @@ -341,16 +372,16 @@ int main (int argc, char **argv) struct recordGroup rGroup; log_event_end (abort_func, NULL); - zebraIndexLock (0); rval = res_get (common_resource, "shadow"); + zebraIndexLock (rGroupDef.bfs, 0, rval); if (rval && *rval && !disableCommit) { - bf_cache (1); + bf_cache (rGroupDef.bfs, rval); zebraIndexLockMsg ("r"); } else { - bf_cache (0); + bf_cache (rGroupDef.bfs, 0); zebraIndexLockMsg ("w"); } zebraIndexWait (0); @@ -360,20 +391,20 @@ int main (int argc, char **argv) switch (cmd) { case 'u': - key_open (mem_max); + key_open (rGroup.bfs, mem_max); logf (LOG_LOG, "updating %s", rGroup.path); repositoryUpdate (&rGroup); nsections = key_close (); break; case 'U': - key_open (mem_max); + key_open (rGroup.bfs,mem_max); logf (LOG_LOG, "updating (pass 1) %s", rGroup.path); repositoryUpdate (&rGroup); key_close (); nsections = 0; break; case 'd': - key_open (mem_max); + key_open (rGroup.bfs,mem_max); logf (LOG_LOG, "deleting %s", rGroup.path); repositoryDelete (&rGroup); nsections = key_close (); @@ -393,8 +424,10 @@ int main (int argc, char **argv) if (nsections) { logf (LOG_LOG, "merging with index"); - key_input (nsections, 60); + key_input (rGroup.bfs, nsections, 60); +#ifndef WINDOWS sync (); +#endif } log_event_end (NULL, NULL); } @@ -428,7 +461,12 @@ int main (int argc, char **argv) } } if (common_resource) + { zebraIndexUnlock (); + bfs_destroy (rGroupDef.bfs); + } + data1_destroy (rGroupDef.dh); exit (0); + return 0; }