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 6feff1b..f622834 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.54  1998-01-12 15:04:08  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
@@ -294,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"), common_resource);
+                   rGroupDef.zebra_maps = zebra_maps_open (common_resource);
                 }
                 if (!strcmp (arg, "update"))
                     cmd = 'u';
@@ -376,7 +382,6 @@ int main (int argc, char **argv)
             {
                 struct recordGroup rGroup;
 
-                log_event_end (abort_func, NULL);
                 rval = res_get (common_resource, "shadow");
                 zebraIndexLock (rGroupDef.bfs, 0, rval);
                if (rGroupDef.flagRw)
@@ -398,28 +403,31 @@ int main (int argc, char **argv)
                 switch (cmd)
                 {
                 case 'u':
-                    if (!key_open (rGroup.bfs, mem_max, rGroup.flagRw))
+                    if (!key_open (rGroup.bfs, mem_max, rGroup.flagRw,
+                                  rGroup.dh))
                    {
                        logf (LOG_LOG, "updating %s", rGroup.path);
                        repositoryUpdate (&rGroup);
-                       nsections = key_close ();
+                       nsections = key_close (rGroup.flagRw);
                    }
                     break;
                 case 'U':
-                    if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw))
+                    if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw,
+                                  rGroup.dh))
                    {
                        logf (LOG_LOG, "updating (pass 1) %s", rGroup.path);
                        repositoryUpdate (&rGroup);
-                       key_close ();
+                       key_close (rGroup.flagRw);
                    }
                     nsections = 0;
                     break;
                 case 'd':
-                    if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw))
+                    if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw,
+                                  rGroup.dh))
                    {
                        logf (LOG_LOG, "deleting %s", rGroup.path);
                        repositoryDelete (&rGroup);
-                       nsections = key_close ();
+                       nsections = key_close (rGroup.flagRw);
                    }
                     break;
                 case 's':