Bug fix: Leading and trailing white space weren't removed in scan tokens.

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

diff --git a/index/main.c b/index/main.c
index 8c18e9f..c586a29 100644 (file)
--- a/index/main.c
+++ b/index/main.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: main.c,v $
- * Revision 1.42  1996-05-31 09:07:01  quinn
+ * Revision 1.45  1996-11-08 11:10:26  adam
+ * Buffers used during file match got bigger.
+ * Compressed ISAM support everywhere.
+ * Bug fixes regarding masking characters in queries.
+ * Redesigned Regexp-2 queries.
+ *
+ * Revision 1.44  1996/10/29 14:09:48  adam
+ * Use of cisam system - enabled if setting isamc is 1.
+ *
+ * Revision 1.43  1996/06/06 12:08:42  quinn
+ * Added showRecord function
+ *
+ * Revision 1.42  1996/05/31  09:07:01  quinn
  * Work on character-set handling
  *
  * Revision 1.41  1996/05/14  14:04:34  adam
@@ -159,13 +171,11 @@
 #include <assert.h>
 #include <unistd.h>
 
-#include <alexutil.h>
 #include <data1.h>
 #include "index.h"
 
 char *prog;
-size_t mem_max = 4*1024*1024;
-extern char *data1_tabpath;
+size_t mem_max = 0;
 
 static void abort_func (int level, const char *msg, void *info)
 {
@@ -191,6 +201,7 @@ int main (int argc, char **argv)
     rGroupDef.recordType = NULL;
     rGroupDef.flagStoreData = -1;
     rGroupDef.flagStoreKeys = -1;
+    rGroupDef.flagShowRecords = 0;
     rGroupDef.fileVerboseFlag = 1;
 
     prog = *argv;
@@ -210,13 +221,14 @@ int main (int argc, char **argv)
        " -d <database> Records belong to Z39.50 database <database>.\n"
        " -m <mbytes>   Use <mbytes> before flushing keys to disk.\n"
         " -n            Don't use shadow system\n"
+       " -s            Show analysis on stdout, but do no work\n"
        " -v <level>    Set logging to <level>\n"
         " -V            Show version\n"
                  );
         exit (1);
     }
     log_event_end (abort_func, NULL);
-    while ((ret = options ("Vt:c:g:d:m:v:n", argv, argc, &arg)) != -2)
+    while ((ret = options ("sVt:c:g:d:m:v:n", argv, argc, &arg)) != -2)
     {
         if (ret == 0)
         {
@@ -233,8 +245,9 @@ int main (int argc, char **argv)
                               configName);
                         exit (1);
                     }
-                    data1_tabpath = res_get (common_resource, "profilePath");
-                    bf_lockDir (res_get (common_resource, "lockPath"));
+                    data1_set_tabpath (res_get (common_resource,
+                                                "profilePath"));
+                    bf_lockDir (res_get (common_resource, "lockDir"));
                    init_charmap();
                 }
                 if (!strcmp (arg, "update"))
@@ -298,7 +311,7 @@ int main (int argc, char **argv)
                         zebraIndexLockMsg ("r");
                     }
                     rec_prstat ();
-                    inv_prstat  (FNAME_WORD_DICT, FNAME_WORD_ISAM);
+                    inv_prstat ();
                 }
                 else
                 {
@@ -362,8 +375,7 @@ int main (int argc, char **argv)
                 if (nsections)
                 {
                     logf (LOG_LOG, "Merging with index");
-                    key_input (FNAME_WORD_DICT, FNAME_WORD_ISAM, nsections,
-                               60);
+                    key_input (nsections, 60);
                     sync ();
                 }
             }
@@ -385,6 +397,10 @@ int main (int argc, char **argv)
         {
             rGroupDef.databaseName = arg;
         }
+       else if (ret == 's')
+       {
+           rGroupDef.flagShowRecords = 1;
+       }
         else if (ret == 'g')
         {
             rGroupDef.groupName = arg;