X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=97ac380aa327d0d4e0a92ec9d8896c526d701470;hb=35590968609f84a4ac4f4965c7b359cf06640491;hp=123887afe34873793b5f0be5ca567a76f37a120f;hpb=73d50b4eee5d1af8aae0ba0f0e7fed7ebad2dd51;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index 123887a..97ac380 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.55  1998-01-26 10:37:34  adam
+ * Revision 1.60  1998-10-28 10:54:39  adam
+ * SDRKit integration.
+ *
+ * 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
@@ -216,6 +235,14 @@
 #include "index.h"
 #include "recindex.h"
 
+#ifndef ZEBRASDR
+#define ZEBRASDR 0
+#endif
+
+#if ZEBRASDR
+#include "zebrasdr.h"
+#endif
+
 char *prog;
 
 Res common_resource = 0;
@@ -234,6 +261,9 @@ int main (int argc, char **argv)
 
     nmem_init ();
 
+#if ZEBRASDR
+    zebraSdr_std ();
+#endif
     rGroupDef.groupName = NULL;
     rGroupDef.databaseName = NULL;
     rGroupDef.path = NULL;
@@ -242,9 +272,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)
@@ -270,7 +304,7 @@ int main (int argc, char **argv)
                  );
         exit (1);
     }
-    while ((ret = options ("sVt:c:g:d:m:v:nf:", argv, argc, &arg)) != -2)
+    while ((ret = options ("sVt:c:g:d:m:v:nf:l:", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
@@ -297,8 +331,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';
@@ -400,28 +433,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':
@@ -452,7 +485,9 @@ int main (int argc, char **argv)
             fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
         }
         else if (ret == 'v')
-            log_init (log_mask_str(arg), prog, NULL);
+            log_init_level (log_mask_str(arg));
+	else if (ret == 'l')
+	    log_init_file (arg);
         else if (ret == 'm')
             mem_max = 1024*1024*atoi(arg);
         else if (ret == 'd')