X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=45da8275f96d499fad924eb406be9342e5f2cdba;hb=75049be3951292bbbbd53d83ca38ccbd191e4b08;hp=6feff1bc2e697e6d9821ade13dbc9e2be85fbe75;hpb=b8fb0cb30ffc1fb35a34608a27245dd091566bb9;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 6feff1b..45da827 100644
--- a/index/main.c
+++ b/index/main.c
@@ -1,10 +1,29 @@
 /*
- * Copyright (C) 1994-1998, Index Data I/S 
+ * Copyright (C) 1994-1998, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.54  1998-01-12 15:04:08  adam
+ * 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
@@ -239,9 +258,13 @@ int main (int argc, char **argv)
     rGroupDef.flagStoreData = -1;
     rGroupDef.flagStoreKeys = -1;
     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)
@@ -294,8 +317,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 +398,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 +419,28 @@ int main (int argc, char **argv)
                 switch (cmd)
                 {
                 case 'u':
-                    if (!key_open (rGroup.bfs, mem_max, rGroup.flagRw))
+                    if (!key_open (&rGroup, mem_max))
 		    {
 			logf (LOG_LOG, "updating %s", rGroup.path);
 			repositoryUpdate (&rGroup);
-			nsections = key_close ();
+			nsections = key_close (&rGroup);
 		    }
                     break;
                 case 'U':
-                    if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw))
+                    if (!key_open (&rGroup, mem_max))
 		    {
 			logf (LOG_LOG, "updating (pass 1) %s", rGroup.path);
 			repositoryUpdate (&rGroup);
-			key_close ();
+			key_close (&rGroup);
 		    }
                     nsections = 0;
                     break;
                 case 'd':
-                    if (!key_open (rGroup.bfs,mem_max, rGroup.flagRw))
+                    if (!key_open (&rGroup,mem_max))
 		    {
 			logf (LOG_LOG, "deleting %s", rGroup.path);
 			repositoryDelete (&rGroup);
-			nsections = key_close ();
+			nsections = key_close (&rGroup);
 		    }
                     break;
                 case 's':