Improved installation. Updated for inclusion of YAZ header files.

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

diff --git a/index/main.c b/index/main.c
index e97ae7c..d10fbcc 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,34 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.65  1999-05-20 12:57:18  adam
+ * Revision 1.73  1999-11-30 13:48:03  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * 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
@@ -246,7 +273,7 @@
 #include <unistd.h>
 #endif
 
-#include <data1.h>
+#include <yaz/data1.h>
 #include "index.h"
 #include "recindex.h"
 
@@ -267,8 +294,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;
 
@@ -343,8 +370,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,
@@ -352,6 +378,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"));
@@ -421,7 +452,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);
@@ -517,13 +548,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));