New result set model and modular ranking system. Moved towards

[idzebra-moved-to-github.git] / index / main.c

diff --git a/index/main.c b/index/main.c
index 5add43e..f622834 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -1,10 +1,24 @@
 /*
- * 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.52  1997-10-31 12:34:04  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
@@ -204,18 +218,12 @@
 
 #include <data1.h>
 #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;
@@ -224,6 +232,7 @@ int main (int argc, char **argv)
     char *configName = NULL;
     int nsections;
     int disableCommit = 0;
+    size_t mem_max = 0;
 
     struct recordGroup rGroupDef;
 
@@ -236,7 +245,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 ();
@@ -280,7 +289,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);
                     }
@@ -292,8 +301,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"));
+                   rGroupDef.zebra_maps = zebra_maps_open (common_resource);
                 }
                 if (!strcmp (arg, "update"))
                     cmd = 'u';
@@ -351,6 +359,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)
@@ -358,7 +367,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
@@ -367,47 +378,57 @@ 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,
+                                  rGroup.dh))
+                   {
+                       logf (LOG_LOG, "updating %s", rGroup.path);
+                       repositoryUpdate (&rGroup);
+                       nsections = key_close (rGroup.flagRw);
+                   }
                     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,
+                                  rGroup.dh))
+                   {
+                       logf (LOG_LOG, "updating (pass 1) %s", rGroup.path);
+                       repositoryUpdate (&rGroup);
+                       key_close (rGroup.flagRw);
+                   }
                     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,
+                                  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);
@@ -443,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')
@@ -455,10 +476,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)
     {