X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fmain.c;h=f6228349e792837df863f13df91f66231585f8b5;hp=a4e72d4ea801d8e9c19c8a151f97a796202db86f;hb=ce3907338568fce46c5751e7e1091a5ad1c8e291;hpb=9167923869bcb07faf7e357c883f070be098c66e diff --git a/index/main.c b/index/main.c index a4e72d4..f622834 100644 --- a/index/main.c +++ b/index/main.c @@ -1,10 +1,43 @@ /* - * Copyright (C) 1994-1996, 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.47 1997-02-12 20:39:46 adam + * 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. + * + * 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. @@ -177,19 +210,19 @@ */ #include #include +#ifdef WINDOWS +#include +#else #include +#endif #include #include "index.h" +#include "recindex.h" char *prog; -size_t mem_max = 0; -static void abort_func (int level, const char *msg, void *info) -{ - if (level & LOG_FATAL) - abort (); -} +Res common_resource = 0; int main (int argc, char **argv) { @@ -199,9 +232,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; @@ -209,8 +245,10 @@ 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 (); prog = *argv; if (argc < 2) @@ -251,14 +289,19 @@ 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); } - 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 (common_resource); } if (!strcmp (arg, "update")) cmd = 'u'; @@ -272,56 +315,62 @@ 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); + Records records; 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 (); + records = rec_open (rGroupDef.bfs, 0); + rec_prstat (records); + rec_close (&records); + inv_prstat (rGroupDef.bfs); } else { @@ -329,47 +378,57 @@ int main (int argc, char **argv) exit (1); } } - else + else { struct recordGroup rGroup; - log_event_end (abort_func, NULL); - zebraIndexLock (0); rval = res_get (common_resource, "shadow"); - if (rval && *rval && !disableCommit) - { - bf_cache (1); - zebraIndexLockMsg ("r"); - } - else - { - bf_cache (0); - zebraIndexLockMsg ("w"); - } - zebraIndexWait (0); - + zebraIndexLock (rGroupDef.bfs, 0, rval); + 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 (mem_max); - logf (LOG_LOG, "updating %s", rGroup.path); - repositoryUpdate (&rGroup); - nsections = key_close (); + if (!key_open (rGroup.bfs, mem_max, rGroup.flagRw, + rGroup.dh)) + { + logf (LOG_LOG, "updating %s", rGroup.path); + repositoryUpdate (&rGroup); + nsections = key_close (rGroup.flagRw); + } break; case 'U': - key_open (mem_max); - logf (LOG_LOG, "updating (pass 1) %s", rGroup.path); - repositoryUpdate (&rGroup); - key_close (); + if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw, + rGroup.dh)) + { + logf (LOG_LOG, "updating (pass 1) %s", rGroup.path); + repositoryUpdate (&rGroup); + key_close (rGroup.flagRw); + } nsections = 0; break; case 'd': - key_open (mem_max); - logf (LOG_LOG, "deleting %s", rGroup.path); - repositoryDelete (&rGroup); - nsections = key_close (); + if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw, + rGroup.dh)) + { + logf (LOG_LOG, "deleting %s", rGroup.path); + repositoryDelete (&rGroup); + nsections = key_close (rGroup.flagRw); + } break; case 's': logf (LOG_LOG, "dumping %s", rGroup.path); @@ -386,8 +445,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); } @@ -403,7 +464,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') @@ -415,13 +476,15 @@ 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) + { zebraIndexUnlock (); + bfs_destroy (rGroupDef.bfs); + } + data1_destroy (rGroupDef.dh); exit (0); + return 0; }