X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fmain.c;h=4ab1ebfd859fa48f2bfb004146579972aedb35eb;hb=a17b23c8615d81523afa6d124d2f91e237f06605;hp=ef92bb6c5b7f732559b6cb8bdb26d8f50f5d2d32;hpb=4ed5fbcd29d2a98b048d1d94510b262d352b4f7c;p=idzebra-moved-to-github.git

diff --git a/index/main.c b/index/main.c
index ef92bb6..4ab1ebf 100644
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,34 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.64  1999-05-15 14:36:38  adam
+ * Revision 1.72  1999-10-14 14:33:50  adam
+ * Added truncation 5=106.
+ *
+ * Revision 1.71  1999/09/08 12:12:06  adam
+ * Fixed bad message.
+ *
+ * Revision 1.70  1999/09/07 07:19:21  adam
+ * Work on character mapping. Implemented replace rules.
+ *
+ * Revision 1.69  1999/07/21 08:31:33  adam
+ * More version info on WIN32.
+ *
+ * Revision 1.68  1999/07/14 10:59:26  adam
+ * Changed functions isc_getmethod, isams_getmethod.
+ * Improved fatal error handling (such as missing EXPLAIN schema).
+ *
+ * Revision 1.67  1999/07/06 12:28:04  adam
+ * Updated record index structure. Format includes version ID. Compression
+ * algorithm ID is stored for each record block.
+ *
+ * Revision 1.66  1999/06/25 13:48:02  adam
+ * Updated MSVC project files.
+ * Added BZIP2 record compression (not very well tested).
+ *
+ * Revision 1.65  1999/05/20 12:57:18  adam
+ * Implemented TCL filter. Updated recctrl system.
+ *
+ * Revision 1.64  1999/05/15 14:36:38  adam
  * Updated dictionary. Implemented "compression" of dictionary.
  *
  * Revision 1.63  1999/03/09 16:27:49  adam
@@ -264,8 +291,8 @@ int main (int argc, char **argv)
     int ret;
     int cmd = 0;
     char *arg;
-    char *configName = NULL;
-    int nsections;
+    char *configName = FNAME_CONFIG;
+    int nsections = 0;
     int disableCommit = 0;
     size_t mem_max = 0;
 
@@ -340,8 +367,7 @@ int main (int argc, char **argv)
                                                 configName : FNAME_CONFIG);
                     if (!common_resource)
                     {
-                        logf (LOG_FATAL, "cannot configuration file `%s'",
-                              configName);
+                        logf (LOG_FATAL, "cannot read file `%s'", configName);
                         exit (1);
                     }
                     data1_set_tabpath (rGroupDef.dh, res_get (common_resource,
@@ -349,6 +375,11 @@ int main (int argc, char **argv)
 
 		    rGroupDef.bfs =
 			bfs_create (res_get (common_resource, "register"));
+                    if (!rGroupDef.bfs)
+                    {
+                        logf (LOG_FATAL, "Cannot access register");
+                        exit(1);
+                    }
 
                     bf_lockDir (rGroupDef.bfs,
 				res_get (common_resource, "lockDir"));
@@ -418,7 +449,7 @@ int main (int argc, char **argv)
                         bf_cache (rGroupDef.bfs, rval);
                         zebraIndexLockMsg ("r");
                     }
-		    records = rec_open (rGroupDef.bfs, 0);
+		    records = rec_open (rGroupDef.bfs, 0, 0);
                     rec_prstat (records);
 		    rec_close (&records);
                     inv_prstat (rGroupDef.bfs);
@@ -514,13 +545,19 @@ int main (int argc, char **argv)
         }
         else if (ret == 'V')
         {
-            fprintf (stderr, "Zebra %s %s\n", 
-#if ZEBRASDR
-			"SDR",
+            fprintf (stderr, "Zebra %s %s\n", ZEBRAVER, ZEBRADATE);
+	    fprintf (stderr, " (C) 1994-1999, Index Data ApS\n");
+#ifdef WIN32
+#ifdef _DEBUG
+            fprintf (stderr, " WIN32 Debug\n");
 #else
-			ZEBRAVER,
+            fprintf (stderr, " WIN32 Release\n");
+#endif
+#endif
+#if HAVE_BZLIB_H
+            fprintf (stderr, "libbzip2\n"
+		     " (C) 1996-1999 Julian R Seward.  All rights reserved.\n");
 #endif
-		        ZEBRADATE);
         }
         else if (ret == 'v')
             log_init_level (log_mask_str(arg));
@@ -549,6 +586,7 @@ int main (int argc, char **argv)
         else
             logf (LOG_WARN, "unknown option '-%s'", arg);
     }
+    recTypes_destroy (rGroupDef.recTypes);
     if (common_resource)
     {
         zebraIndexUnlock ();